diff options
author | Jonas Gorski <jogo@openwrt.org> | 2014-06-21 19:23:38 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2014-06-21 19:23:38 +0000 |
commit | 1d0c4edda14e0be05362dc7c63de2eb378676a13 (patch) | |
tree | 0246c4e2ef7b0a463d75d49bdf1305c60ee48f9d /target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch | |
parent | 6cacd1932f77b4026e00e1d170ecca9c1d388867 (diff) | |
download | upstream-1d0c4edda14e0be05362dc7c63de2eb378676a13.tar.gz upstream-1d0c4edda14e0be05362dc7c63de2eb378676a13.tar.bz2 upstream-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/537-board_fast2504n.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch b/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch index 6f6420031d..821a185793 100644 --- a/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch +++ b/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch @@ -6,7 +6,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org> --- --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -3797,6 +3797,96 @@ static struct board_info __initdata boar +@@ -3784,6 +3784,96 @@ static struct board_info __initdata boar .devs = nb6_devices, .num_devs = ARRAY_SIZE(nb6_devices), }; @@ -103,7 +103,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org> #endif /* -@@ -4018,6 +4108,7 @@ static const struct board_info __initcon +@@ -4005,6 +4095,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, |