summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2014-06-21 19:23:38 +0000
committerJonas Gorski <jogo@openwrt.org>2014-06-21 19:23:38 +0000
commit43cc8c3ebec4658963d44a6108f8f74e8ccdbb54 (patch)
tree5e1eda807e353fc17f5fa4da15611b58d7524833 /target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
parent21d65bb185225a3a5369756fc44acbbbfbc2f651 (diff)
downloadmaster-31e0f0ae-43cc8c3ebec4658963d44a6108f8f74e8ccdbb54.tar.gz
master-31e0f0ae-43cc8c3ebec4658963d44a6108f8f74e8ccdbb54.tar.bz2
master-31e0f0ae-43cc8c3ebec4658963d44a6108f8f74e8ccdbb54.zip
brcm63xx: allow bcm963xx and livebox support at the same time
Use the CFE_EPTSEAL to tell them apart at runtime. Added for now only for the 3.14 until properly tested. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 41296
Diffstat (limited to 'target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch b/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
index 96d771610c..b9977e2fbf 100644
--- a/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
+++ b/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4441,6 +4441,75 @@ static struct board_info __initdata boar
+@@ -4428,6 +4428,75 @@ static struct board_info __initdata boar
#endif
/*
@@ -76,7 +76,7 @@
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -4525,6 +4594,9 @@ static const struct board_info __initcon
+@@ -4512,6 +4581,9 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
#endif
@@ -85,4 +85,4 @@
+#endif
};
- /*
+ static void __init boardid_fixup(u8 *boot_addr)