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/801-ssb_export_fallback_sprom.patch | |
parent | 21d65bb185225a3a5369756fc44acbbbfbc2f651 (diff) | |
download | master-31e0f0ae-43cc8c3ebec4658963d44a6108f8f74e8ccdbb54.tar.gz master-31e0f0ae-43cc8c3ebec4658963d44a6108f8f74e8ccdbb54.tar.bz2 master-31e0f0ae-43cc8c3ebec4658963d44a6108f8f74e8ccdbb54.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>
SVN-Revision: 41296
Diffstat (limited to 'target/linux/brcm63xx/patches-3.14/801-ssb_export_fallback_sprom.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.14/801-ssb_export_fallback_sprom.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/801-ssb_export_fallback_sprom.patch b/target/linux/brcm63xx/patches-3.14/801-ssb_export_fallback_sprom.patch index 3c0faba8ae..1e75cfe0d6 100644 --- a/target/linux/brcm63xx/patches-3.14/801-ssb_export_fallback_sprom.patch +++ b/target/linux/brcm63xx/patches-3.14/801-ssb_export_fallback_sprom.patch @@ -1,14 +1,14 @@ ---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c -+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -14,6 +14,7 @@ +--- a/arch/mips/bcm63xx/boards/board_common.c ++++ b/arch/mips/bcm63xx/boards/board_common.c +@@ -13,6 +13,7 @@ + #include <linux/platform_device.h> #include <linux/ssb/ssb.h> #include <linux/gpio_keys.h> - #include <linux/input.h> +#include <linux/export.h> #include <linux/spi/spi.h> - #include <linux/spi/spi_gpio.h> - #if 0 /* FIXME: 3.14 removed non-DT support */ -@@ -4879,7 +4880,7 @@ static const struct board_info __initcon + #include <asm/addrspace.h> + #include <asm/bootinfo.h> +@@ -49,7 +50,7 @@ static struct board_info board; * bcm4318 WLAN work */ #ifdef CONFIG_SSB_PCIHOST @@ -17,7 +17,7 @@ .revision = 0x02, .board_rev = 0x17, .country_code = 0x0, -@@ -4899,6 +4900,7 @@ static struct ssb_sprom bcm63xx_sprom = +@@ -69,6 +70,7 @@ static struct ssb_sprom bcm63xx_sprom = .boardflags_lo = 0x2848, .boardflags_hi = 0x0000, }; |