SVN-Revision: 32845master
parent
ab2cb9ce61
commit
e0837a51f0
@ -1,7 +1,6 @@ |
|||||||
|
|
||||||
--- a/arch/mips/bcm47xx/nvram.c
|
--- a/arch/mips/bcm47xx/nvram.c
|
||||||
+++ b/arch/mips/bcm47xx/nvram.c
|
+++ b/arch/mips/bcm47xx/nvram.c
|
||||||
@@ -268,8 +268,7 @@ int nvram_getenv(char *name, char *val,
|
@@ -107,8 +107,7 @@ int nvram_getenv(char *name, char *val,
|
||||||
value = eq + 1;
|
value = eq + 1;
|
||||||
if ((eq - var) == strlen(name) &&
|
if ((eq - var) == strlen(name) &&
|
||||||
strncmp(var, name, (eq - var)) == 0) {
|
strncmp(var, name, (eq - var)) == 0) {
|
@ -1,4 +1,3 @@ |
|||||||
|
|
||||||
--- a/arch/mips/include/asm/mach-bcm47xx/nvram.h
|
--- a/arch/mips/include/asm/mach-bcm47xx/nvram.h
|
||||||
+++ b/arch/mips/include/asm/mach-bcm47xx/nvram.h
|
+++ b/arch/mips/include/asm/mach-bcm47xx/nvram.h
|
||||||
@@ -37,7 +37,7 @@ struct nvram_header {
|
@@ -37,7 +37,7 @@ struct nvram_header {
|
@ -1,11 +1,11 @@ |
|||||||
--- a/arch/mips/bcm47xx/setup.c
|
--- a/arch/mips/bcm47xx/setup.c
|
||||||
+++ b/arch/mips/bcm47xx/setup.c
|
+++ b/arch/mips/bcm47xx/setup.c
|
||||||
@@ -163,8 +163,6 @@ static int bcm47xx_get_invariants(struct
|
@@ -115,8 +115,6 @@ static int bcm47xx_get_invariants(struct
|
||||||
iv->boardinfo.vendor = SSB_BOARDVENDOR_BCM;
|
iv->boardinfo.vendor = SSB_BOARDVENDOR_BCM;
|
||||||
if (nvram_getenv("boardtype", buf, sizeof(buf)) >= 0)
|
if (nvram_getenv("boardtype", buf, sizeof(buf)) >= 0)
|
||||||
iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0);
|
iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0);
|
||||||
- if (nvram_getenv("boardrev", buf, sizeof(buf)) >= 0)
|
- if (nvram_getenv("boardrev", buf, sizeof(buf)) >= 0)
|
||||||
- iv->boardinfo.rev = (u16)simple_strtoul(buf, NULL, 0);
|
- iv->boardinfo.rev = (u16)simple_strtoul(buf, NULL, 0);
|
||||||
|
|
||||||
memset(&iv->sprom, 0, sizeof(struct ssb_sprom));
|
|
||||||
bcm47xx_fill_sprom(&iv->sprom, NULL);
|
bcm47xx_fill_sprom(&iv->sprom, NULL);
|
||||||
|
|
@ -1,17 +1,17 @@ |
|||||||
--- a/arch/mips/bcm47xx/setup.c
|
--- a/arch/mips/bcm47xx/setup.c
|
||||||
+++ b/arch/mips/bcm47xx/setup.c
|
+++ b/arch/mips/bcm47xx/setup.c
|
||||||
@@ -297,6 +297,8 @@ static void __init bcm47xx_register_bcma
|
@@ -190,6 +190,8 @@ static void __init bcm47xx_register_bcma
|
||||||
|
err = bcma_host_soc_register(&bcm47xx_bus.bcma);
|
||||||
if (bcm47xx_bus.bcma.bus.drv_cc.flash_type == BCMA_NFLASH)
|
if (err)
|
||||||
bcm47xx_nflash_struct_bcma_init(&bcm47xx_nflash, &bcm47xx_bus.bcma.bus.drv_cc);
|
panic("Failed to initialize BCMA bus (err %d)", err);
|
||||||
+
|
+
|
||||||
+ bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL);
|
+ bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static int __init bcm47xx_register_flash_bcma(void)
|
|
||||||
--- a/arch/mips/bcm47xx/sprom.c
|
--- a/arch/mips/bcm47xx/sprom.c
|
||||||
+++ b/arch/mips/bcm47xx/sprom.c
|
+++ b/arch/mips/bcm47xx/sprom.c
|
||||||
@@ -628,3 +628,15 @@ void bcm47xx_fill_ssb_boardinfo(struct s
|
@@ -630,3 +630,15 @@ void bcm47xx_fill_ssb_boardinfo(struct s
|
||||||
nvram_read_u16(prefix, NULL, "boardtype", &boardinfo->type, 0);
|
nvram_read_u16(prefix, NULL, "boardtype", &boardinfo->type, 0);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
@ -0,0 +1,10 @@ |
|||||||
|
--- a/arch/mips/bcm47xx/Kconfig
|
||||||
|
+++ b/arch/mips/bcm47xx/Kconfig
|
||||||
|
@@ -21,6 +21,7 @@ config BCM47XX_BCMA
|
||||||
|
select BCMA
|
||||||
|
select BCMA_HOST_SOC
|
||||||
|
select BCMA_DRIVER_MIPS
|
||||||
|
+ select BCMA_HOST_PCI if PCI
|
||||||
|
select BCMA_DRIVER_PCI_HOSTMODE if PCI
|
||||||
|
default y
|
||||||
|
help
|
Loading…
Reference in new issue