aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.3/421-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-07-06 22:10:37 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-07-06 22:10:37 +0000
commitbb1488e5e7ae25aaaa740f074d8ab2e1f37fe700 (patch)
treea35d5de37280443d76886591fd1b8a9cec67ab9b /target/linux/brcm63xx/patches-3.3/421-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch
parent1f2d5da8876fd4475b47093bb566d2eecb87de13 (diff)
downloadupstream-bb1488e5e7ae25aaaa740f074d8ab2e1f37fe700.tar.gz
upstream-bb1488e5e7ae25aaaa740f074d8ab2e1f37fe700.tar.bz2
upstream-bb1488e5e7ae25aaaa740f074d8ab2e1f37fe700.zip
Detect alternative "cfe-" version bootloaders (found in 963281T_TEF board)
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> SVN-Revision: 32643
Diffstat (limited to 'target/linux/brcm63xx/patches-3.3/421-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.3/421-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm63xx/patches-3.3/421-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch b/target/linux/brcm63xx/patches-3.3/421-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch
index db1891c948..ff2a831d84 100644
--- a/target/linux/brcm63xx/patches-3.3/421-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch
+++ b/target/linux/brcm63xx/patches-3.3/421-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch
@@ -125,7 +125,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
u32 val;
/* read base address of boot chip select (0)
-@@ -784,32 +750,19 @@ void __init board_prom_init(void)
+@@ -786,32 +752,19 @@ void __init board_prom_init(void)
strcpy(cfe_version, "unknown");
printk(KERN_INFO PFX "CFE version: %s\n", cfe_version);
@@ -162,7 +162,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
continue;
/* copy, board desc array is marked initdata */
memcpy(&board, bcm963xx_boards[i], sizeof(board));
-@@ -819,7 +772,7 @@ void __init board_prom_init(void)
+@@ -821,7 +774,7 @@ void __init board_prom_init(void)
/* bail out if board is not found, will complain later */
if (!board.name[0]) {
char name[17];
@@ -171,7 +171,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
name[16] = 0;
printk(KERN_ERR PFX "unknown bcm963xx board: %s\n",
name);
-@@ -912,15 +865,15 @@ int __init board_register_devices(void)
+@@ -914,15 +867,15 @@ int __init board_register_devices(void)
bcm63xx_pcmcia_register();
if (board.has_enet0 &&
@@ -190,7 +190,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
bcm63xx_enetsw_register(&board.enetsw);
if (board.has_ehci0)
-@@ -936,7 +889,7 @@ int __init board_register_devices(void)
+@@ -938,7 +891,7 @@ int __init board_register_devices(void)
* do this after registering enet devices
*/
#ifdef CONFIG_SSB_PCIHOST