diff options
author | Jonas Gorski <jogo@openwrt.org> | 2014-07-08 12:27:55 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2014-07-08 12:27:55 +0000 |
commit | 5787156b55216dd241ead36f56f058ff77d92110 (patch) | |
tree | e88a8d6d871fd14530988418998e002f152bc427 /target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch | |
parent | bbf839a3e399e36a66ffab7a65797ba254b4ec1d (diff) | |
download | master-187ad058-5787156b55216dd241ead36f56f058ff77d92110.tar.gz master-187ad058-5787156b55216dd241ead36f56f058ff77d92110.tar.bz2 master-187ad058-5787156b55216dd241ead36f56f058ff77d92110.zip |
brcm63xx: fixup patches borked by allowing too much fuzz
Move defines and board_info structs back to their proper locations so
(de-)selecting SOC support won't break the build.
Reported-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41550 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch b/target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch index cad29a5d72..82f94f6166 100644 --- a/target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch +++ b/target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -635,6 +635,13 @@ static struct board_info __initdata boar +@@ -47,6 +47,12 @@ #define NB4_SPI_GPIO_CLK 6 #define NB4_74HC64_GPIO(X) (NB4_74X164_GPIO_BASE + (X)) @@ -10,11 +10,10 @@ +#define CT6373_SPI_GPIO_CLK 6 +#define CT6373_74HC64_GPIO(X) (CT6373_74X164_GPIO_BASE + (X)) + -+ - - .has_ohci0 = 1, - .has_pccard = 1, -@@ -2335,6 +2342,117 @@ static struct board_info __initdata boar + /* + * known 3368 boards + */ +@@ -2335,6 +2341,117 @@ static struct board_info __initdata boar .num_spis = ARRAY_SIZE(nb4_spi_devices), }; @@ -132,7 +131,7 @@ static struct board_info __initdata board_HW553 = { .name = "HW553", .expected_cpu_id = 0x6358, -@@ -2679,6 +2797,7 @@ static const struct board_info __initcon +@@ -2679,6 +2796,7 @@ static const struct board_info __initcon &board_nb4_ser_r2, &board_nb4_fxc_r1, &board_nb4_fxc_r2, |