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/520-bcm63xx-add-support-for-96368MVWG-board.patch | |
parent | 6cacd1932f77b4026e00e1d170ecca9c1d388867 (diff) | |
download | master-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/520-bcm63xx-add-support-for-96368MVWG-board.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch index 524cd975b7..19708bb7d1 100644 --- a/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch +++ b/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch @@ -10,7 +10,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2238,6 +2238,85 @@ static struct board_info __initdata boar +@@ -2224,6 +2224,85 @@ static struct board_info __initdata boar #endif /* @@ -96,7 +96,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -2292,6 +2371,10 @@ static const struct board_info __initcon +@@ -2278,6 +2357,10 @@ static const struct board_info __initcon &board_HW553, &board_spw303v, #endif @@ -106,8 +106,10 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. +#endif }; - /* -@@ -2473,12 +2556,25 @@ void __init board_prom_init(void) + static void __init boardid_fixup(u8 *boot_addr) +--- a/arch/mips/bcm63xx/boards/board_common.c ++++ b/arch/mips/bcm63xx/boards/board_common.c +@@ -123,12 +123,25 @@ void __init board_early_setup(const stru bcm63xx_pci_enabled = 1; if (BCMCPU_IS_6348()) val |= GPIO_MODE_6348_G2_PCI; |