diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-12-05 19:20:26 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-12-05 19:20:26 +0000 |
| commit | 2f7964de3e1deff75e909d424677c133bd629c90 (patch) | |
| tree | 0e3b035570f2632cf4cbed0ccd2401c9027de209 /target | |
| parent | 852f7b37ed345e32db50a7fc82e72929a0e13fdc (diff) | |
| download | upstream-2f7964de3e1deff75e909d424677c133bd629c90.tar.gz upstream-2f7964de3e1deff75e909d424677c133bd629c90.tar.bz2 upstream-2f7964de3e1deff75e909d424677c133bd629c90.zip | |
brcm47xx: do not read from CFE
SVN-Revision: 24267
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/brcm47xx/files/drivers/mtd/maps/bcm47xx-flash.c | 18 |
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) |