Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

brcm47xx: do not read from CFE

Browse source 
SVN-Revision: 24267
This commit is contained in:
Hauke Mehrtens 2010-12-05 19:20:26 +00:00
parent 852f7b37ed
commit 2f7964de3e
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
target/linux/brcm47xx/files/drivers/mtd/maps/bcm47xx-flash.c
View file

@ -398,23 +398,17 @@ static int get_router(void)
u16 sdram_init = 0; u16 sdram_init = 0;
u16 cardbus = 0; u16 cardbus = 0;
if (nvram_getenv("boardnum", buf, sizeof(buf)) >= 0 || if (nvram_getenv("boardnum", buf, sizeof(buf)) >= 0)
cfe_getenv("boardnum", buf, sizeof(buf)) >= 0)
boardnum = simple_strtoul(buf, NULL, 0); boardnum = simple_strtoul(buf, NULL, 0);
if (nvram_getenv("boardtype", buf, sizeof(buf)) >= 0 || if (nvram_getenv("boardtype", buf, sizeof(buf)) >= 0)
cfe_getenv("boardtype", buf, sizeof(buf)) >= 0)
boardtype = simple_strtoul(buf, NULL, 0); boardtype = simple_strtoul(buf, NULL, 0);
if (nvram_getenv("boardrev", buf, sizeof(buf)) >= 0 || if (nvram_getenv("boardrev", buf, sizeof(buf)) >= 0)
cfe_getenv("boardrev", buf, sizeof(buf)) >= 0)
boardrev = simple_strtoul(buf, NULL, 0); boardrev = simple_strtoul(buf, NULL, 0);
if (nvram_getenv("boardflags", buf, sizeof(buf)) >= 0 || if (nvram_getenv("boardflags", buf, sizeof(buf)) >= 0)
cfe_getenv("boardflags", buf, sizeof(buf)) >= 0)
boardflags = simple_strtoul(buf, NULL, 0); boardflags = simple_strtoul(buf, NULL, 0);
if (nvram_getenv("sdram_init", buf, sizeof(buf)) >= 0 || if (nvram_getenv("sdram_init", buf, sizeof(buf)) >= 0)
cfe_getenv("sdram_init", buf, sizeof(buf)) >= 0)
sdram_init = simple_strtoul(buf, NULL, 0); sdram_init = simple_strtoul(buf, NULL, 0);
if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0 || if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0)
cfe_getenv("cardbus", buf, sizeof(buf)) >= 0)
cardbus = simple_strtoul(buf, NULL, 0); cardbus = simple_strtoul(buf, NULL, 0);
if ((boardnum == 8 || boardnum == 01) if ((boardnum == 8 || boardnum == 01)