aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.14/503-board-CPVA642.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/503-board-CPVA642.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/503-board-CPVA642.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.14/503-board-CPVA642.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/503-board-CPVA642.patch b/target/linux/brcm63xx/patches-3.14/503-board-CPVA642.patch
index bc2346330f..9485ad9af8 100644
--- a/target/linux/brcm63xx/patches-3.14/503-board-CPVA642.patch
+++ b/target/linux/brcm63xx/patches-3.14/503-board-CPVA642.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -756,6 +756,98 @@ static struct board_info __initdata boar
+@@ -742,6 +742,98 @@ static struct board_info __initdata boar
},
};
@@ -99,7 +99,7 @@
static struct board_info __initdata board_AGPFS0 = {
.name = "AGPF-S0",
.expected_cpu_id = 0x6358,
-@@ -1434,6 +1526,7 @@ static const struct board_info __initcon
+@@ -1420,6 +1512,7 @@ static const struct board_info __initcon
&board_96358vw,
&board_96358vw2,
&board_AGPFS0,