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 | 43cc8c3ebec4658963d44a6108f8f74e8ccdbb54 (patch) | |
| tree | 5e1eda807e353fc17f5fa4da15611b58d7524833 /target/linux/brcm63xx/patches-3.14/528-board_nb6.patch | |
| parent | 21d65bb185225a3a5369756fc44acbbbfbc2f651 (diff) | |
| download | mtk-20170518-43cc8c3ebec4658963d44a6108f8f74e8ccdbb54.zip mtk-20170518-43cc8c3ebec4658963d44a6108f8f74e8ccdbb54.tar.gz mtk-20170518-43cc8c3ebec4658963d44a6108f8f74e8ccdbb54.tar.bz2 | |
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/528-board_nb6.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.14/528-board_nb6.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch b/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch index 70cd2b2..b3455d3 100644 --- a/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch +++ b/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -19,6 +19,7 @@ +@@ -18,6 +18,7 @@ #if 0 /* FIXME: 3.14 removed non-DT support */ #include <linux/spi/74x164.h> #endif @@ -8,7 +8,7 @@ #include <asm/addrspace.h> #include <bcm63xx_board.h> #include <bcm63xx_cpu.h> -@@ -58,6 +59,8 @@ +@@ -634,6 +635,8 @@ static struct board_info __initdata boar #define NB4_SPI_GPIO_MOSI 7 #define NB4_SPI_GPIO_CLK 6 #define NB4_74HC64_GPIO(X) (NB4_74X164_GPIO_BASE + (X)) @@ -17,7 +17,7 @@ #define CT6373_PID_OFFSET 0xff80 #define CT6373_74X164_GPIO_BASE 64 -@@ -2682,6 +2685,104 @@ static struct board_info __initdata boar +@@ -2668,6 +2671,104 @@ static struct board_info __initdata boar }; #endif @@ -122,7 +122,7 @@ /* * known 6368 boards */ -@@ -2888,6 +2989,10 @@ static const struct board_info __initcon +@@ -2874,6 +2975,10 @@ static const struct board_info __initcon &board_DVAG3810BN, #endif @@ -133,7 +133,7 @@ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, -@@ -2955,6 +3060,11 @@ static void __init boardid_fixup(u8 *boo +@@ -2895,6 +3000,11 @@ static void __init boardid_fixup(u8 *boo } } |