aboutsummaryrefslogtreecommitdiffstats
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
commit1d0c4edda14e0be05362dc7c63de2eb378676a13 (patch)
tree0246c4e2ef7b0a463d75d49bdf1305c60ee48f9d /target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
parent6cacd1932f77b4026e00e1d170ecca9c1d388867 (diff)
downloadmaster-187ad058-1d0c4edda14e0be05362dc7c63de2eb378676a13.tar.gz
master-187ad058-1d0c4edda14e0be05362dc7c63de2eb378676a13.tar.bz2
master-187ad058-1d0c4edda14e0be05362dc7c63de2eb378676a13.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41296 3c298f89-4303-0410-b956-a3cf2f4a3e73
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)