summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-06-30 23:26:02 +0000
committerJonas Gorski <jogo@openwrt.org>2015-06-30 23:26:02 +0000
commit3a9e4ba8960ae2bfa327f1a4911b104b6cbb523e (patch)
tree2e7fde0e36b4cf3d2b7b2f4b41cafd8c99d83fc2 /target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch
parent206f1db59ed21e42e4a80991d9ef77918f8fbb92 (diff)
downloadmaster-31e0f0ae-3a9e4ba8960ae2bfa327f1a4911b104b6cbb523e.tar.gz
master-31e0f0ae-3a9e4ba8960ae2bfa327f1a4911b104b6cbb523e.tar.bz2
master-31e0f0ae-3a9e4ba8960ae2bfa327f1a4911b104b6cbb523e.zip
brcm63xx: unbreak board_probe_switch again
Also move it to an earlier place so new boards added are less likely to confuse quilt. Fixes #19965. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46148
Diffstat (limited to 'target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch b/target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch
index 60fe53cb19..2d8951fc08 100644
--- a/target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -702,6 +702,27 @@ static struct board_info __initdata boar
+@@ -720,6 +720,27 @@ static struct board_info __initdata boar
.ext_irq = 2,
},
};
@@ -28,7 +28,7 @@
#endif /* CONFIG_BCM63XX_CPU_6348 */
/*
-@@ -1026,6 +1047,7 @@ static const struct board_info __initcon
+@@ -1052,6 +1073,7 @@ static const struct board_info __initcon
&board_96348_D4PW,
&board_spw500v,
&board_96348sv,
@@ -36,7 +36,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1065,6 +1087,7 @@ static struct of_device_id const bcm963x
+@@ -1091,6 +1113,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, },
{ .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
@@ -44,7 +44,7 @@
{ .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, },
{ .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, },
{ .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
-@@ -1124,6 +1147,22 @@ void __init board_bcm963xx_init(void)
+@@ -1150,6 +1173,22 @@ void __init board_bcm963xx_init(void)
val &= MPI_CSBASE_BASE_MASK;
}
boot_addr = (u8 *)KSEG1ADDR(val);