aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2010-12-05 19:20:26 +0000
committerHauke Mehrtens <hauke@openwrt.org>2010-12-05 19:20:26 +0000
commite508b3c1c997a8fd12e2fcae036b00aa3064effe (patch)
treedad1f60048ac6a88ff062277808ddfc9e78c95f8 /target/linux
parenta3239da5861210e11b191eac3138df571aa22737 (diff)
downloadupstream-e508b3c1c997a8fd12e2fcae036b00aa3064effe.tar.gz
upstream-e508b3c1c997a8fd12e2fcae036b00aa3064effe.tar.bz2
upstream-e508b3c1c997a8fd12e2fcae036b00aa3064effe.zip
brcm47xx: do not read from CFE
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24267 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/brcm47xx/files/drivers/mtd/maps/bcm47xx-flash.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/target/linux/brcm47xx/files/drivers/mtd/maps/bcm47xx-flash.c b/target/linux/brcm47xx/files/drivers/mtd/maps/bcm47xx-flash.c
index 4585c4f9ee..a9bdc9642d 100644
--- a/target/linux/brcm47xx/files/drivers/mtd/maps/bcm47xx-flash.c
+++ b/target/linux/brcm47xx/files/drivers/mtd/maps/bcm47xx-flash.c
@@ -398,23 +398,17 @@ static int get_router(void)
u16 sdram_init = 0;
u16 cardbus = 0;
- if (nvram_getenv("boardnum", buf, sizeof(buf)) >= 0 ||
- cfe_getenv("boardnum", buf, sizeof(buf)) >= 0)
+ if (nvram_getenv("boardnum", buf, sizeof(buf)) >= 0)
boardnum = simple_strtoul(buf, NULL, 0);
- if (nvram_getenv("boardtype", buf, sizeof(buf)) >= 0 ||
- cfe_getenv("boardtype", buf, sizeof(buf)) >= 0)
+ if (nvram_getenv("boardtype", buf, sizeof(buf)) >= 0)
boardtype = simple_strtoul(buf, NULL, 0);
- if (nvram_getenv("boardrev", buf, sizeof(buf)) >= 0 ||
- cfe_getenv("boardrev", buf, sizeof(buf)) >= 0)
+ if (nvram_getenv("boardrev", buf, sizeof(buf)) >= 0)
boardrev = simple_strtoul(buf, NULL, 0);
- if (nvram_getenv("boardflags", buf, sizeof(buf)) >= 0 ||
- cfe_getenv("boardflags", buf, sizeof(buf)) >= 0)
+ if (nvram_getenv("boardflags", buf, sizeof(buf)) >= 0)
boardflags = simple_strtoul(buf, NULL, 0);
- if (nvram_getenv("sdram_init", buf, sizeof(buf)) >= 0 ||
- cfe_getenv("sdram_init", buf, sizeof(buf)) >= 0)
+ if (nvram_getenv("sdram_init", buf, sizeof(buf)) >= 0)
sdram_init = simple_strtoul(buf, NULL, 0);
- if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0 ||
- cfe_getenv("cardbus", buf, sizeof(buf)) >= 0)
+ if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0)
cardbus = simple_strtoul(buf, NULL, 0);
if ((boardnum == 8 || boardnum == 01)