aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2014-07-12 12:31:39 +0000
committerJonas Gorski <jogo@openwrt.org>2014-07-12 12:31:39 +0000
commit2f3d81bb2321a19df0ec35ff48663ed2a27031d3 (patch)
treefad5056378135ab984140dda72247106e0f115a6
parent2a2e220324036971db8bbff0d9afe5a66e4bf00b (diff)
downloadupstream-2f3d81bb2321a19df0ec35ff48663ed2a27031d3.tar.gz
upstream-2f3d81bb2321a19df0ec35ff48663ed2a27031d3.tar.bz2
upstream-2f3d81bb2321a19df0ec35ff48663ed2a27031d3.zip
brcm63xx: Fix HW553 support
- adsl and lan leds are swapped. - internetkey is labeled as hspa. - enable status led and reset button for failsafe. - use new leds script. - fix switch configuration. - remove enet0 from board_info. - add profile. Signed-off-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@41588 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds5
-rwxr-xr-xtarget/linux/brcm63xx/base-files/etc/uci-defaults/02_network2
-rwxr-xr-xtarget/linux/brcm63xx/base-files/lib/brcm63xx.sh5
-rw-r--r--target/linux/brcm63xx/generic/profiles/201-Huawei.mk (renamed from target/linux/brcm63xx/generic/profiles/201-HW556.mk)13
-rw-r--r--target/linux/brcm63xx/patches-3.10/508-board_hw553.patch25
-rw-r--r--target/linux/brcm63xx/patches-3.10/509-board_rta1320_16m.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.10/510-board_spw303v.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.10/511-board_V2500V.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.10/512-board_BTV2110.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.10/514-board_ct536_ct5621.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.10/516-board_96348A-122.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.10/519_board_CPVA502plus.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.10/521-bcm63xx-add-support-for-96368MVNgr-board.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.10/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.10/524-board_dsl_274xb_rev_f.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.10/527-board_dva-g3810bn-tl-1.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.10/528-board_nb6.patch6
-rw-r--r--target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.10/530-board_A4001N1.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.10/531-board_AR-5387un.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.10/532-board_AR-5381u.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.10/534-board_hw556.patch6
-rw-r--r--target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.10/536-board_fast2704.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.10/537-board_fast2504n.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.10/558-board_AR1004G.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.10/559-board_vw6339gu.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.10/561-board_WAP-5813n.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.14/508-board_hw553.patch25
-rw-r--r--target/linux/brcm63xx/patches-3.14/509-board_rta1320_16m.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.14/510-board_spw303v.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.14/511-board_V2500V.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.14/512-board_BTV2110.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.14/514-board_ct536_ct5621.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.14/516-board_96348A-122.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.14/519_board_CPVA502plus.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.14/524-board_dsl_274xb_rev_f.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.14/525-board_96348w3.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.14/527-board_dva-g3810bn-tl-1.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.14/528-board_nb6.patch6
-rw-r--r--target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.14/530-board_A4001N1.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.14/531-board_AR-5387un.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.14/532-board_AR-5381u.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.14/534-board_hw556.patch6
-rw-r--r--target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.14/559-board_vw6339gu.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch4
68 files changed, 130 insertions, 125 deletions
diff --git a/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds b/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds
index ae7ed96093..fb26cfba2b 100644
--- a/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds
@@ -14,6 +14,11 @@ case "$board_name" in
'F@ST2704V2')
ucidef_set_led_usbdev "usb" "USB" "F@ST2704V2:green:usb" "1-1"
;;
+HW553)
+ ucidef_set_led_netdev "lan" "LAN" "HW553:blue:lan" "eth0"
+ ucidef_set_led_usbdev "usb1" "USB1" "HW553:red:hspa" "1-1"
+ ucidef_set_led_usbdev "usb2" "USB2" "HW553:blue:hspa" "1-2"
+ ;;
esac
ucidef_commit_leds
diff --git a/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network b/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network
index f091523c93..ffd2a1eead 100755
--- a/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network
+++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network
@@ -52,7 +52,6 @@ AGPF-S0 |\
DV201AMR |\
DWV-S0 |\
"F@ST2404" |\
-HW553 |\
MAGIC |\
RTA1025W_16 |\
V2500V_BB)
@@ -63,6 +62,7 @@ V2500V_BB)
AW4139 |\
AW4339U |\
+HW553 |\
HW556*)
ucidef_set_interface_lan "eth0.1"
ucidef_add_switch "eth0" "1" "1"
diff --git a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
index a01606a7a0..97998a10ae 100755
--- a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
+++ b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
@@ -80,6 +80,11 @@ brcm63xx_detect() {
brcm63xx_has_reset_button="true"
ifname=eth1
;;
+ HW553)
+ status_led="HW553:blue:power"
+ brcm63xx_has_reset_button="true"
+ ifname=eth0
+ ;;
HW556*)
status_led="HW556:red:power"
brcm63xx_has_reset_button="true"
diff --git a/target/linux/brcm63xx/generic/profiles/201-HW556.mk b/target/linux/brcm63xx/generic/profiles/201-Huawei.mk
index 68861b3ef2..3cdd018ace 100644
--- a/target/linux/brcm63xx/generic/profiles/201-HW556.mk
+++ b/target/linux/brcm63xx/generic/profiles/201-Huawei.mk
@@ -1,10 +1,20 @@
#
-# Copyright (C) 2012 OpenWrt.org
+# Copyright (C) 2012-2014 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
+define Profile/HW553
+ NAME:=Huawei HG553
+ PACKAGES:=kmod-b43 wpad-mini \
+ kmod-usb2 kmod-usb-ohci kmod-ledtrig-usbdev
+endef
+define Profile/HW553/Description
+ Package set optimized for Huawei HG553 using open-source b43 WiFi driver
+endef
+$(eval $(call Profile,HW553))
+
define Profile/HW556
NAME:=HW556 WiFi
PACKAGES:=kmod-rt2800-pci kmod-ath9k wpad-mini
@@ -14,4 +24,3 @@ define Profile/HW556/Description
Package set compatible with hardware using Atheros or Ralink WiFi cards (Huawei HG556a)
endef
$(eval $(call Profile,HW556))
-
diff --git a/target/linux/brcm63xx/patches-3.10/508-board_hw553.patch b/target/linux/brcm63xx/patches-3.10/508-board_hw553.patch
index 086209c6ac..4039998af4 100644
--- a/target/linux/brcm63xx/patches-3.10/508-board_hw553.patch
+++ b/target/linux/brcm63xx/patches-3.10/508-board_hw553.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1764,6 +1764,83 @@ static struct board_info __initdata boar
+@@ -1764,6 +1764,76 @@ static struct board_info __initdata boar
.spis = nb4_spi_devices,
.num_spis = ARRAY_SIZE(nb4_spi_devices),
};
@@ -11,15 +11,9 @@
+
+ .has_uart0 = 1,
+
-+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
+
-+ .enet0 = {
-+ .has_phy = 1,
-+ .use_internal_phy = 1,
-+ },
-+
+ .enet1 = {
+ .has_phy = 1,
+ .phy_id = 0,
@@ -33,22 +27,22 @@
+
+ .leds = {
+ {
-+ .name = "HW553:red:lan",
++ .name = "HW553:red:adsl",
+ .gpio = 34,
+ .active_low = 1,
+ },
+ {
-+ .name = "HW553:blue:lan",
++ .name = "HW553:blue:adsl",
+ .gpio = 35,
+ .active_low = 1,
+ },
+ {
-+ .name = "HW553:red:adsl",
++ .name = "HW553:red:lan",
+ .gpio = 22,
+ .active_low = 1,
+ },
+ {
-+ .name = "HW553:blue:adsl",
++ .name = "HW553:blue:lan",
+ .gpio = 23,
+ .active_low = 1,
+ },
@@ -56,13 +50,12 @@
+ .name = "HW553:red:power",
+ .gpio = 5,
+ .active_low = 1,
-+ .default_trigger = "default-on",
+ },
-+
+ {
+ .name = "HW553:blue:power",
+ .gpio = 4,
+ .active_low = 1,
++ .default_trigger = "default-on",
+ },
+ {
+ .name = "HW553:red:wifi",
@@ -70,12 +63,12 @@
+ .active_low = 1,
+ },
+ {
-+ .name = "HW553:red:internetkey",
++ .name = "HW553:red:hspa",
+ .gpio = 12,
+ .active_low = 1,
+ },
+ {
-+ .name = "HW553:blue:internetkey",
++ .name = "HW553:blue:hspa",
+ .gpio = 13,
+ .active_low = 1,
+ },
@@ -84,7 +77,7 @@
#endif
/*
-@@ -1812,6 +1889,7 @@ static const struct board_info __initcon
+@@ -1812,6 +1882,7 @@ static const struct board_info __initcon
&board_nb4_ser_r2,
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
diff --git a/target/linux/brcm63xx/patches-3.10/509-board_rta1320_16m.patch b/target/linux/brcm63xx/patches-3.10/509-board_rta1320_16m.patch
index 14c7001571..530c22adba 100644
--- a/target/linux/brcm63xx/patches-3.10/509-board_rta1320_16m.patch
+++ b/target/linux/brcm63xx/patches-3.10/509-board_rta1320_16m.patch
@@ -46,7 +46,7 @@
#endif
/*
-@@ -1857,6 +1896,7 @@ static const struct board_info __initcon
+@@ -1850,6 +1889,7 @@ static const struct board_info __initcon
&board_96338gw,
&board_96338w,
&board_96338w2_e7t,
diff --git a/target/linux/brcm63xx/patches-3.10/510-board_spw303v.patch b/target/linux/brcm63xx/patches-3.10/510-board_spw303v.patch
index 2a4fa008f3..1f86653168 100644
--- a/target/linux/brcm63xx/patches-3.10/510-board_spw303v.patch
+++ b/target/linux/brcm63xx/patches-3.10/510-board_spw303v.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1880,6 +1880,72 @@ static struct board_info __initdata boar
+@@ -1873,6 +1873,72 @@ static struct board_info __initdata boar
},
},
};
@@ -73,7 +73,7 @@
#endif
/*
-@@ -1930,6 +1996,7 @@ static const struct board_info __initcon
+@@ -1923,6 +1989,7 @@ static const struct board_info __initcon
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
&board_HW553,
diff --git a/target/linux/brcm63xx/patches-3.10/511-board_V2500V.patch b/target/linux/brcm63xx/patches-3.10/511-board_V2500V.patch
index bea4f7e77b..8541f2a2bd 100644
--- a/target/linux/brcm63xx/patches-3.10/511-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-3.10/511-board_V2500V.patch
@@ -66,7 +66,7 @@
#endif
/*
-@@ -1981,6 +2040,7 @@ static const struct board_info __initcon
+@@ -1974,6 +2033,7 @@ static const struct board_info __initcon
&board_96348_D4PW,
&board_spw500v,
&board_96348sv,
@@ -74,7 +74,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2056,6 +2116,22 @@ void __init board_bcm963xx_init(void)
+@@ -2049,6 +2109,22 @@ void __init board_bcm963xx_init(void)
val &= MPI_CSBASE_BASE_MASK;
}
boot_addr = (u8 *)KSEG1ADDR(val);
diff --git a/target/linux/brcm63xx/patches-3.10/512-board_BTV2110.patch b/target/linux/brcm63xx/patches-3.10/512-board_BTV2110.patch
index d6449a1178..c19e8d80b0 100644
--- a/target/linux/brcm63xx/patches-3.10/512-board_BTV2110.patch
+++ b/target/linux/brcm63xx/patches-3.10/512-board_BTV2110.patch
@@ -65,7 +65,7 @@
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -2041,6 +2099,7 @@ static const struct board_info __initcon
+@@ -2034,6 +2092,7 @@ static const struct board_info __initcon
&board_spw500v,
&board_96348sv,
&board_V2500V_BB,
diff --git a/target/linux/brcm63xx/patches-3.10/514-board_ct536_ct5621.patch b/target/linux/brcm63xx/patches-3.10/514-board_ct536_ct5621.patch
index d2a106e2cf..54c69636cb 100644
--- a/target/linux/brcm63xx/patches-3.10/514-board_ct536_ct5621.patch
+++ b/target/linux/brcm63xx/patches-3.10/514-board_ct536_ct5621.patch
@@ -52,7 +52,7 @@
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -2100,6 +2145,7 @@ static const struct board_info __initcon
+@@ -2093,6 +2138,7 @@ static const struct board_info __initcon
&board_96348sv,
&board_V2500V_BB,
&board_V2110,
diff --git a/target/linux/brcm63xx/patches-3.10/516-board_96348A-122.patch b/target/linux/brcm63xx/patches-3.10/516-board_96348A-122.patch
index 22057bee88..7f5a8dad5e 100644
--- a/target/linux/brcm63xx/patches-3.10/516-board_96348A-122.patch
+++ b/target/linux/brcm63xx/patches-3.10/516-board_96348A-122.patch
@@ -70,7 +70,7 @@
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -2149,6 +2212,7 @@ static const struct board_info __initcon
+@@ -2142,6 +2205,7 @@ static const struct board_info __initcon
&board_V2500V_BB,
&board_V2110,
&board_ct536_ct5621,
diff --git a/target/linux/brcm63xx/patches-3.10/519_board_CPVA502plus.patch b/target/linux/brcm63xx/patches-3.10/519_board_CPVA502plus.patch
index 921c3aa5ca..c2efcefc83 100644
--- a/target/linux/brcm63xx/patches-3.10/519_board_CPVA502plus.patch
+++ b/target/linux/brcm63xx/patches-3.10/519_board_CPVA502plus.patch
@@ -43,7 +43,7 @@
#endif
/*
-@@ -2214,6 +2250,7 @@ static const struct board_info __initcon
+@@ -2207,6 +2243,7 @@ static const struct board_info __initcon
&board_V2110,
&board_ct536_ct5621,
&board_96348A_122,
diff --git a/target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch
index 59fbbe68f3..2b32a72cd1 100644
--- a/target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch
+++ b/target/linux/brcm63xx/patches-3.10/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
-@@ -2214,6 +2214,85 @@ static struct board_info __initdata boar
+@@ -2207,6 +2207,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[] = {
-@@ -2268,6 +2347,10 @@ static const struct board_info __initcon
+@@ -2261,6 +2340,10 @@ static const struct board_info __initcon
&board_HW553,
&board_spw303v,
#endif
diff --git a/target/linux/brcm63xx/patches-3.10/521-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/brcm63xx/patches-3.10/521-bcm63xx-add-support-for-96368MVNgr-board.patch
index 0459c7f404..e9e174b824 100644
--- a/target/linux/brcm63xx/patches-3.10/521-bcm63xx-add-support-for-96368MVNgr-board.patch
+++ b/target/linux/brcm63xx/patches-3.10/521-bcm63xx-add-support-for-96368MVNgr-board.patch
@@ -9,7 +9,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2290,6 +2290,72 @@ static struct board_info __initdata boar
+@@ -2283,6 +2283,72 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
@@ -82,7 +82,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
#endif
/*
-@@ -2350,6 +2416,7 @@ static const struct board_info __initcon
+@@ -2343,6 +2409,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
diff --git a/target/linux/brcm63xx/patches-3.10/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/brcm63xx/patches-3.10/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
index 157bd744b0..97e7722eff 100644
--- a/target/linux/brcm63xx/patches-3.10/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
+++ b/target/linux/brcm63xx/patches-3.10/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
@@ -86,7 +86,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
#endif
/*
-@@ -2399,6 +2469,7 @@ static const struct board_info __initcon
+@@ -2392,6 +2462,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
diff --git a/target/linux/brcm63xx/patches-3.10/524-board_dsl_274xb_rev_f.patch b/target/linux/brcm63xx/patches-3.10/524-board_dsl_274xb_rev_f.patch
index 1c0943ce97..b6896ddfb0 100644
--- a/target/linux/brcm63xx/patches-3.10/524-board_dsl_274xb_rev_f.patch
+++ b/target/linux/brcm63xx/patches-3.10/524-board_dsl_274xb_rev_f.patch
@@ -122,7 +122,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
#endif
/*
-@@ -2470,6 +2575,7 @@ static const struct board_info __initcon
+@@ -2463,6 +2568,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,
diff --git a/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch b/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch
index a69cfcc366..f72da612ad 100644
--- a/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch
+++ b/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch
@@ -60,7 +60,7 @@
#endif
/*
-@@ -2605,6 +2658,7 @@ static const struct board_info __initcon
+@@ -2598,6 +2651,7 @@ static const struct board_info __initcon
&board_ct536_ct5621,
&board_96348A_122,
&board_CPVA502plus,
diff --git a/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch b/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch
index 1d42dde1c1..981aafbc87 100644
--- a/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch
+++ b/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch
@@ -127,7 +127,7 @@
static struct board_info __initdata board_HW553 = {
.name = "HW553",
.expected_cpu_id = 0x6358,
-@@ -2673,6 +2786,7 @@ static const struct board_info __initcon
+@@ -2666,6 +2779,7 @@ static const struct board_info __initcon
&board_nb4_ser_r2,
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
diff --git a/target/linux/brcm63xx/patches-3.10/527-board_dva-g3810bn-tl-1.patch b/target/linux/brcm63xx/patches-3.10/527-board_dva-g3810bn-tl-1.patch
index 63c5f26160..531aabe49b 100644
--- a/target/linux/brcm63xx/patches-3.10/527-board_dva-g3810bn-tl-1.patch
+++ b/target/linux/brcm63xx/patches-3.10/527-board_dva-g3810bn-tl-1.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2584,6 +2584,73 @@ static struct board_info __initdata boar
+@@ -2577,6 +2577,73 @@ static struct board_info __initdata boar
},
}
};
@@ -74,7 +74,7 @@
#endif
/*
-@@ -2789,6 +2856,7 @@ static const struct board_info __initcon
+@@ -2782,6 +2849,7 @@ static const struct board_info __initcon
&board_ct6373_1,
&board_HW553,
&board_spw303v,
diff --git a/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch b/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch
index f0f18ea456..d275a88b6f 100644
--- a/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch
+++ b/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch
@@ -17,7 +17,7 @@
#define CT6373_PID_OFFSET 0xff80
#define CT6373_74X164_GPIO_BASE 64
-@@ -2653,6 +2656,104 @@ static struct board_info __initdata boar
+@@ -2646,6 +2649,104 @@ static struct board_info __initdata boar
};
#endif
@@ -122,7 +122,7 @@
/*
* known 6368 boards
*/
-@@ -2859,6 +2960,10 @@ static const struct board_info __initcon
+@@ -2852,6 +2953,10 @@ static const struct board_info __initcon
&board_DVAG3810BN,
#endif
@@ -133,7 +133,7 @@
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
-@@ -2880,6 +2985,11 @@ static void __init boardid_fixup(u8 *boo
+@@ -2873,6 +2978,11 @@ static void __init boardid_fixup(u8 *boo
}
}
diff --git a/target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch b/target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch
index bb605a6800..a6bbabdf34 100644
--- a/target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch
+++ b/target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch
@@ -58,7 +58,7 @@
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
-@@ -2928,6 +2979,7 @@ static const struct board_info __initcon
+@@ -2921,6 +2972,7 @@ static const struct board_info __initcon
&board_96348gw_10,
&board_96348gw_11,
&board_FAST2404,
diff --git a/target/linux/brcm63xx/patches-3.10/530-board_A4001N1.patch b/target/linux/brcm63xx/patches-3.10/530-board_A4001N1.patch
index ea2cb1d3bf..e6de8956dc 100644
--- a/target/linux/brcm63xx/patches-3.10/530-board_A4001N1.patch
+++ b/target/linux/brcm63xx/patches-3.10/530-board_A4001N1.patch
@@ -127,7 +127,7 @@
static struct board_info __initdata board_dsl_274xb_f1 = {
.name = "AW4339U",
.expected_cpu_id = 0x6328,
-@@ -2960,6 +3080,7 @@ static const struct board_info __initcon
+@@ -2953,6 +3073,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,
diff --git a/target/linux/brcm63xx/patches-3.10/531-board_AR-5387un.patch b/target/linux/brcm63xx/patches-3.10/531-board_AR-5387un.patch
index 08062751e8..266360b8af 100644
--- a/target/linux/brcm63xx/patches-3.10/531-board_AR-5387un.patch
+++ b/target/linux/brcm63xx/patches-3.10/531-board_AR-5387un.patch
@@ -80,7 +80,7 @@
static struct board_info __initdata board_963281TAN = {
.name = "963281TAN",
.expected_cpu_id = 0x6328,
-@@ -3079,6 +3152,7 @@ static const struct board_info __initcon
+@@ -3072,6 +3145,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
diff --git a/target/linux/brcm63xx/patches-3.10/532-board_AR-5381u.patch b/target/linux/brcm63xx/patches-3.10/532-board_AR-5381u.patch
index 5cda917ba3..14acb27801 100644
--- a/target/linux/brcm63xx/patches-3.10/532-board_AR-5381u.patch
+++ b/target/linux/brcm63xx/patches-3.10/532-board_AR-5381u.patch
@@ -74,7 +74,7 @@
static struct board_info __initdata board_AR5387un = {
.name = "96328A-1441N1",
.expected_cpu_id = 0x6328,
-@@ -3152,6 +3219,7 @@ static const struct board_info __initcon
+@@ -3145,6 +3212,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
diff --git a/target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch b/target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch
index 894ce59078..9e6f5bcdbe 100644
--- a/target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch
+++ b/target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch
@@ -56,7 +56,7 @@
#endif
/*
-@@ -3233,6 +3282,7 @@ static const struct board_info __initcon
+@@ -3226,6 +3275,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
diff --git a/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch b/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch
index ab15a1cf35..edfb4a401a 100644
--- a/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch
+++ b/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch
@@ -8,7 +8,7 @@
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
-@@ -2882,6 +2883,492 @@ static struct board_info __initdata boar
+@@ -2875,6 +2876,492 @@ static struct board_info __initdata boar
},
};
@@ -501,7 +501,7 @@
/* T-Home Speedport W 303V Typ B */
static struct board_info __initdata board_spw303v = {
.name = "96358-502V",
-@@ -3321,6 +3808,10 @@ static const struct board_info __initcon
+@@ -3314,6 +3801,10 @@ static const struct board_info __initcon
&board_nb4_fxc_r2,
&board_ct6373_1,
&board_HW553,
@@ -512,7 +512,7 @@
&board_spw303v,
&board_DVAG3810BN,
#endif
-@@ -3340,13 +3831,37 @@ static void __init boardid_fixup(u8 *boo
+@@ -3333,13 +3824,37 @@ static void __init boardid_fixup(u8 *boo
struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
char *board_name = (char *)bcm63xx_nvram_get_name();
diff --git a/target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch b/target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch
index 6ab5a4edfb..291750b3fb 100644
--- a/target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch
+++ b/target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch
@@ -61,7 +61,7 @@
#endif
/*
-@@ -3770,6 +3824,7 @@ static const struct board_info __initcon
+@@ -3763,6 +3817,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
&board_rta770bw,
diff --git a/target/linux/brcm63xx/patches-3.10/536-board_fast2704.patch b/target/linux/brcm63xx/patches-3.10/536-board_fast2704.patch
index d377d8be05..967c779a5c 100644
--- a/target/linux/brcm63xx/patches-3.10/536-board_fast2704.patch
+++ b/target/linux/brcm63xx/patches-3.10/536-board_fast2704.patch
@@ -135,7 +135,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
-@@ -3814,6 +3930,7 @@ static const struct board_info __initcon
+@@ -3807,6 +3923,7 @@ static const struct board_info __initcon
&board_963281TAN,
&board_A4001N1,
&board_dsl_274xb_f1,
diff --git a/target/linux/brcm63xx/patches-3.10/537-board_fast2504n.patch b/target/linux/brcm63xx/patches-3.10/537-board_fast2504n.patch
index 918212c432..acef3d6da8 100644
--- a/target/linux/brcm63xx/patches-3.10/537-board_fast2504n.patch
+++ b/target/linux/brcm63xx/patches-3.10/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
-@@ -3769,6 +3769,96 @@ static struct board_info __initdata boar
+@@ -3762,6 +3762,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
/*
-@@ -3990,6 +4080,7 @@ static const struct board_info __initcon
+@@ -3983,6 +4073,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6362
&board_nb6,
diff --git a/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch b/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch
index 5ba1a2906e..a24f80c644 100644
--- a/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch
+++ b/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch
@@ -94,7 +94,7 @@
* known 6328 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6328
-@@ -4244,6 +4331,9 @@ static const struct board_info __initcon
+@@ -4237,6 +4324,9 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_3368
&board_cvg834g,
#endif
diff --git a/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch b/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch
index 228250d071..5864294889 100644
--- a/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch
+++ b/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch
@@ -95,7 +95,7 @@
#endif
/*
-@@ -4333,6 +4421,7 @@ static const struct board_info __initcon
+@@ -4326,6 +4414,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,
diff --git a/target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch b/target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch
index 6899b0a0e0..72bdf8f7fa 100644
--- a/target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch
+++ b/target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4413,6 +4413,75 @@ static struct board_info __initdata boar
+@@ -4406,6 +4406,75 @@ static struct board_info __initdata boar
#endif
/*
@@ -76,7 +76,7 @@
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -4497,6 +4566,9 @@ static const struct board_info __initcon
+@@ -4490,6 +4559,9 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
#endif
diff --git a/target/linux/brcm63xx/patches-3.10/558-board_AR1004G.patch b/target/linux/brcm63xx/patches-3.10/558-board_AR1004G.patch
index eb676ca846..66b6664628 100644
--- a/target/linux/brcm63xx/patches-3.10/558-board_AR1004G.patch
+++ b/target/linux/brcm63xx/patches-3.10/558-board_AR1004G.patch
@@ -60,7 +60,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
#endif
/*
-@@ -4533,6 +4578,7 @@ static const struct board_info __initcon
+@@ -4526,6 +4571,7 @@ static const struct board_info __initcon
&board_96348A_122,
&board_CPVA502plus,
&board_96348W3,
diff --git a/target/linux/brcm63xx/patches-3.10/559-board_vw6339gu.patch b/target/linux/brcm63xx/patches-3.10/559-board_vw6339gu.patch
index 3a0c6af3d4..0041fdf831 100644
--- a/target/linux/brcm63xx/patches-3.10/559-board_vw6339gu.patch
+++ b/target/linux/brcm63xx/patches-3.10/559-board_vw6339gu.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4524,6 +4524,108 @@ static struct board_info __initdata boar
+@@ -4517,6 +4517,108 @@ static struct board_info __initdata boar
},
},
};
@@ -109,7 +109,7 @@
#endif
/*
-@@ -4614,6 +4716,7 @@ static const struct board_info __initcon
+@@ -4607,6 +4709,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963269bhr,
diff --git a/target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch b/target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch
index bdf010bf3b..9b79f883de 100644
--- a/target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch
+++ b/target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4461,6 +4461,131 @@ static struct board_info __initdata boar
+@@ -4454,6 +4454,131 @@ static struct board_info __initdata boar
* known 63268/63269 boards
*/
#ifdef CONFIG_BCM63XX_CPU_63268
@@ -132,7 +132,7 @@
static struct board_info __initdata board_963269bhr = {
.name = "963269BHR",
.expected_cpu_id = 0x63268,
-@@ -4715,6 +4840,7 @@ static const struct board_info __initcon
+@@ -4708,6 +4833,7 @@ static const struct board_info __initcon
&board_96368mvngr,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
diff --git a/target/linux/brcm63xx/patches-3.10/561-board_WAP-5813n.patch b/target/linux/brcm63xx/patches-3.10/561-board_WAP-5813n.patch
index 33eb2b07de..ece61d2036 100644
--- a/target/linux/brcm63xx/patches-3.10/561-board_WAP-5813n.patch
+++ b/target/linux/brcm63xx/patches-3.10/561-board_WAP-5813n.patch
@@ -8,7 +8,7 @@
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
-@@ -4455,6 +4456,99 @@ static struct board_info __initdata boar
+@@ -4448,6 +4449,99 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
@@ -108,7 +108,7 @@
#endif
/*
-@@ -4838,6 +4932,7 @@ static const struct board_info __initcon
+@@ -4831,6 +4925,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
diff --git a/target/linux/brcm63xx/patches-3.14/508-board_hw553.patch b/target/linux/brcm63xx/patches-3.14/508-board_hw553.patch
index 3627ea5e8c..3ea981e6c0 100644
--- a/target/linux/brcm63xx/patches-3.14/508-board_hw553.patch
+++ b/target/linux/brcm63xx/patches-3.14/508-board_hw553.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1770,6 +1770,83 @@ static struct board_info __initdata boar
+@@ -1770,6 +1770,76 @@ static struct board_info __initdata boar
.spis = nb4_spi_devices,
.num_spis = ARRAY_SIZE(nb4_spi_devices),
};
@@ -11,15 +11,9 @@
+
+ .has_uart0 = 1,
+
-+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
+
-+ .enet0 = {
-+ .has_phy = 1,
-+ .use_internal_phy = 1,
-+ },
-+
+ .enet1 = {
+ .has_phy = 1,
+ .phy_id = 0,
@@ -33,22 +27,22 @@
+
+ .leds = {
+ {
-+ .name = "HW553:red:lan",
++ .name = "HW553:red:adsl",
+ .gpio = 34,
+ .active_low = 1,
+ },
+ {
-+ .name = "HW553:blue:lan",
++ .name = "HW553:blue:adsl",
+ .gpio = 35,
+ .active_low = 1,
+ },
+ {
-+ .name = "HW553:red:adsl",
++ .name = "HW553:red:lan",
+ .gpio = 22,
+ .active_low = 1,
+ },
+ {
-+ .name = "HW553:blue:adsl",
++ .name = "HW553:blue:lan",
+ .gpio = 23,
+ .active_low = 1,
+ },
@@ -56,13 +50,12 @@
+ .name = "HW553:red:power",
+ .gpio = 5,
+ .active_low = 1,
-+ .default_trigger = "default-on",
+ },
-+
+ {
+ .name = "HW553:blue:power",
+ .gpio = 4,
+ .active_low = 1,
++ .default_trigger = "default-on",
+ },
+ {
+ .name = "HW553:red:wifi",
@@ -70,12 +63,12 @@
+ .active_low = 1,
+ },
+ {
-+ .name = "HW553:red:internetkey",
++ .name = "HW553:red:hspa",
+ .gpio = 12,
+ .active_low = 1,
+ },
+ {
-+ .name = "HW553:blue:internetkey",
++ .name = "HW553:blue:hspa",
+ .gpio = 13,
+ .active_low = 1,
+ },
@@ -84,7 +77,7 @@
#endif
/*
-@@ -1818,6 +1895,7 @@ static const struct board_info __initcon
+@@ -1818,6 +1888,7 @@ static const struct board_info __initcon
&board_nb4_ser_r2,
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
diff --git a/target/linux/brcm63xx/patches-3.14/509-board_rta1320_16m.patch b/target/linux/brcm63xx/patches-3.14/509-board_rta1320_16m.patch
index db68d0de72..34bb77dc0b 100644
--- a/target/linux/brcm63xx/patches-3.14/509-board_rta1320_16m.patch
+++ b/target/linux/brcm63xx/patches-3.14/509-board_rta1320_16m.patch
@@ -46,7 +46,7 @@
#endif
/*
-@@ -1863,6 +1902,7 @@ static const struct board_info __initcon
+@@ -1856,6 +1895,7 @@ static const struct board_info __initcon
&board_96338gw,
&board_96338w,
&board_96338w2_e7t,
diff --git a/target/linux/brcm63xx/patches-3.14/510-board_spw303v.patch b/target/linux/brcm63xx/patches-3.14/510-board_spw303v.patch
index 19802e78d0..3a8391efae 100644
--- a/target/linux/brcm63xx/patches-3.14/510-board_spw303v.patch
+++ b/target/linux/brcm63xx/patches-3.14/510-board_spw303v.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1886,6 +1886,72 @@ static struct board_info __initdata boar
+@@ -1879,6 +1879,72 @@ static struct board_info __initdata boar
},
},
};
@@ -73,7 +73,7 @@
#endif
/*
-@@ -1936,6 +2002,7 @@ static const struct board_info __initcon
+@@ -1929,6 +1995,7 @@ static const struct board_info __initcon
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
&board_HW553,
diff --git a/target/linux/brcm63xx/patches-3.14/511-board_V2500V.patch b/target/linux/brcm63xx/patches-3.14/511-board_V2500V.patch
index 9ff27f3bea..e2beacd5d6 100644
--- a/target/linux/brcm63xx/patches-3.14/511-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-3.14/511-board_V2500V.patch
@@ -66,7 +66,7 @@
#endif
/*
-@@ -1987,6 +2046,7 @@ static const struct board_info __initcon
+@@ -1980,6 +2039,7 @@ static const struct board_info __initcon
&board_96348_D4PW,
&board_spw500v,
&board_96348sv,
@@ -74,7 +74,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2062,6 +2122,22 @@ void __init board_bcm963xx_init(void)
+@@ -2055,6 +2115,22 @@ void __init board_bcm963xx_init(void)
val &= MPI_CSBASE_BASE_MASK;
}
boot_addr = (u8 *)KSEG1ADDR(val);
diff --git a/target/linux/brcm63xx/patches-3.14/512-board_BTV2110.patch b/target/linux/brcm63xx/patches-3.14/512-board_BTV2110.patch
index f3b414beac..0926321403 100644
--- a/target/linux/brcm63xx/patches-3.14/512-board_BTV2110.patch
+++ b/target/linux/brcm63xx/patches-3.14/512-board_BTV2110.patch
@@ -65,7 +65,7 @@
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -2047,6 +2105,7 @@ static const struct board_info __initcon
+@@ -2040,6 +2098,7 @@ static const struct board_info __initcon
&board_spw500v,
&board_96348sv,
&board_V2500V_BB,
diff --git a/target/linux/brcm63xx/patches-3.14/514-board_ct536_ct5621.patch b/target/linux/brcm63xx/patches-3.14/514-board_ct536_ct5621.patch
index 8e8a64c02d..aa0cd8b7a9 100644
--- a/target/linux/brcm63xx/patches-3.14/514-board_ct536_ct5621.patch
+++ b/target/linux/brcm63xx/patches-3.14/514-board_ct536_ct5621.patch
@@ -52,7 +52,7 @@
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -2106,6 +2151,7 @@ static const struct board_info __initcon
+@@ -2099,6 +2144,7 @@ static const struct board_info __initcon
&board_96348sv,
&board_V2500V_BB,
&board_V2110,
diff --git a/target/linux/brcm63xx/patches-3.14/516-board_96348A-122.patch b/target/linux/brcm63xx/patches-3.14/516-board_96348A-122.patch
index e814407845..af31ee346b 100644
--- a/target/linux/brcm63xx/patches-3.14/516-board_96348A-122.patch
+++ b/target/linux/brcm63xx/patches-3.14/516-board_96348A-122.patch
@@ -70,7 +70,7 @@
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -2155,6 +2218,7 @@ static const struct board_info __initcon
+@@ -2148,6 +2211,7 @@ static const struct board_info __initcon
&board_V2500V_BB,
&board_V2110,
&board_ct536_ct5621,
diff --git a/target/linux/brcm63xx/patches-3.14/519_board_CPVA502plus.patch b/target/linux/brcm63xx/patches-3.14/519_board_CPVA502plus.patch
index 4887fb24a7..9949c75beb 100644
--- a/target/linux/brcm63xx/patches-3.14/519_board_CPVA502plus.patch
+++ b/target/linux/brcm63xx/patches-3.14/519_board_CPVA502plus.patch
@@ -43,7 +43,7 @@
#endif
/*
-@@ -2220,6 +2256,7 @@ static const struct board_info __initcon
+@@ -2213,6 +2249,7 @@ static const struct board_info __initcon
&board_V2110,
&board_ct536_ct5621,
&board_96348A_122,
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 aa64bff4f1..217c429049 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
-@@ -2220,6 +2220,85 @@ static struct board_info __initdata boar
+@@ -2213,6 +2213,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[] = {
-@@ -2274,6 +2353,10 @@ static const struct board_info __initcon
+@@ -2267,6 +2346,10 @@ static const struct board_info __initcon
&board_HW553,
&board_spw303v,
#endif
diff --git a/target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch
index 93f7872316..61de2b8e76 100644
--- a/target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch
+++ b/target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch
@@ -9,7 +9,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2296,6 +2296,72 @@ static struct board_info __initdata boar
+@@ -2289,6 +2289,72 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
@@ -82,7 +82,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
#endif
/*
-@@ -2356,6 +2422,7 @@ static const struct board_info __initcon
+@@ -2349,6 +2415,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
diff --git a/target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
index 9137ebc41d..dbe68485cd 100644
--- a/target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
+++ b/target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
@@ -86,7 +86,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
#endif
/*
-@@ -2405,6 +2475,7 @@ static const struct board_info __initcon
+@@ -2398,6 +2468,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
diff --git a/target/linux/brcm63xx/patches-3.14/524-board_dsl_274xb_rev_f.patch b/target/linux/brcm63xx/patches-3.14/524-board_dsl_274xb_rev_f.patch
index a21fdb21db..b3759020a3 100644
--- a/target/linux/brcm63xx/patches-3.14/524-board_dsl_274xb_rev_f.patch
+++ b/target/linux/brcm63xx/patches-3.14/524-board_dsl_274xb_rev_f.patch
@@ -122,7 +122,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
#endif
/*
-@@ -2476,6 +2581,7 @@ static const struct board_info __initcon
+@@ -2469,6 +2574,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,
diff --git a/target/linux/brcm63xx/patches-3.14/525-board_96348w3.patch b/target/linux/brcm63xx/patches-3.14/525-board_96348w3.patch
index 3564428870..1d2a51e2aa 100644
--- a/target/linux/brcm63xx/patches-3.14/525-board_96348w3.patch
+++ b/target/linux/brcm63xx/patches-3.14/525-board_96348w3.patch
@@ -60,7 +60,7 @@
#endif
/*
-@@ -2611,6 +2664,7 @@ static const struct board_info __initcon
+@@ -2604,6 +2657,7 @@ static const struct board_info __initcon
&board_ct536_ct5621,
&board_96348A_122,
&board_CPVA502plus,
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 82f94f6166..3a906300e7 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
@@ -131,7 +131,7 @@
static struct board_info __initdata board_HW553 = {
.name = "HW553",
.expected_cpu_id = 0x6358,
-@@ -2679,6 +2796,7 @@ static const struct board_info __initcon
+@@ -2672,6 +2789,7 @@ static const struct board_info __initcon
&board_nb4_ser_r2,
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
diff --git a/target/linux/brcm63xx/patches-3.14/527-board_dva-g3810bn-tl-1.patch b/target/linux/brcm63xx/patches-3.14/527-board_dva-g3810bn-tl-1.patch
index 30b4b1c50f..b1d8481743 100644
--- a/target/linux/brcm63xx/patches-3.14/527-board_dva-g3810bn-tl-1.patch
+++ b/target/linux/brcm63xx/patches-3.14/527-board_dva-g3810bn-tl-1.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2594,6 +2594,73 @@ static struct board_info __initdata boar
+@@ -2587,6 +2587,73 @@ static struct board_info __initdata boar
},
}
};
@@ -74,7 +74,7 @@
#endif
/*
-@@ -2799,6 +2866,7 @@ static const struct board_info __initcon
+@@ -2792,6 +2859,7 @@ static const struct board_info __initcon
&board_ct6373_1,
&board_HW553,
&board_spw303v,
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 31d7eddc6d..f107b9b9e8 100644
--- a/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch
+++ b/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch
@@ -17,7 +17,7 @@
#define CT6373_PID_OFFSET 0xff80
#define CT6373_74X164_GPIO_BASE 64
-@@ -2663,6 +2666,104 @@ static struct board_info __initdata boar
+@@ -2656,6 +2659,104 @@ static struct board_info __initdata boar
};
#endif
@@ -122,7 +122,7 @@
/*
* known 6368 boards
*/
-@@ -2869,6 +2970,10 @@ static const struct board_info __initcon
+@@ -2862,6 +2963,10 @@ static const struct board_info __initcon
&board_DVAG3810BN,
#endif
@@ -133,7 +133,7 @@
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
-@@ -2890,6 +2995,11 @@ static void __init boardid_fixup(u8 *boo
+@@ -2883,6 +2988,11 @@ static void __init boardid_fixup(u8 *boo
}
}
diff --git a/target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch b/target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch
index 83eb1d536d..2fc3a86860 100644
--- a/target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch
+++ b/target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch
@@ -58,7 +58,7 @@
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
-@@ -2938,6 +2989,7 @@ static const struct board_info __initcon
+@@ -2931,6 +2982,7 @@ static const struct board_info __initcon
&board_96348gw_10,
&board_96348gw_11,
&board_FAST2404,
diff --git a/target/linux/brcm63xx/patches-3.14/530-board_A4001N1.patch b/target/linux/brcm63xx/patches-3.14/530-board_A4001N1.patch
index 4706e8ce1f..f73629ea55 100644
--- a/target/linux/brcm63xx/patches-3.14/530-board_A4001N1.patch
+++ b/target/linux/brcm63xx/patches-3.14/530-board_A4001N1.patch
@@ -127,7 +127,7 @@
static struct board_info __initdata board_dsl_274xb_f1 = {
.name = "AW4339U",
.expected_cpu_id = 0x6328,
-@@ -2970,6 +3090,7 @@ static const struct board_info __initcon
+@@ -2963,6 +3083,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,
diff --git a/target/linux/brcm63xx/patches-3.14/531-board_AR-5387un.patch b/target/linux/brcm63xx/patches-3.14/531-board_AR-5387un.patch
index c62b5dd027..fe8e577843 100644
--- a/target/linux/brcm63xx/patches-3.14/531-board_AR-5387un.patch
+++ b/target/linux/brcm63xx/patches-3.14/531-board_AR-5387un.patch
@@ -80,7 +80,7 @@
static struct board_info __initdata board_963281TAN = {
.name = "963281TAN",
.expected_cpu_id = 0x6328,
-@@ -3089,6 +3162,7 @@ static const struct board_info __initcon
+@@ -3082,6 +3155,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
diff --git a/target/linux/brcm63xx/patches-3.14/532-board_AR-5381u.patch b/target/linux/brcm63xx/patches-3.14/532-board_AR-5381u.patch
index d9bb8458a7..89ad361130 100644
--- a/target/linux/brcm63xx/patches-3.14/532-board_AR-5381u.patch
+++ b/target/linux/brcm63xx/patches-3.14/532-board_AR-5381u.patch
@@ -74,7 +74,7 @@
static struct board_info __initdata board_AR5387un = {
.name = "96328A-1441N1",
.expected_cpu_id = 0x6328,
-@@ -3162,6 +3229,7 @@ static const struct board_info __initcon
+@@ -3155,6 +3222,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
diff --git a/target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch b/target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch
index b2e28a32f1..dd67e1da03 100644
--- a/target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch
+++ b/target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch
@@ -56,7 +56,7 @@
#endif
/*
-@@ -3243,6 +3292,7 @@ static const struct board_info __initcon
+@@ -3236,6 +3285,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
diff --git a/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch b/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
index fa8465763f..b3b81ede13 100644
--- a/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
+++ b/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
@@ -8,7 +8,7 @@
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
-@@ -2892,6 +2893,492 @@ static struct board_info __initdata boar
+@@ -2885,6 +2886,492 @@ static struct board_info __initdata boar
},
};
@@ -501,7 +501,7 @@
/* T-Home Speedport W 303V Typ B */
static struct board_info __initdata board_spw303v = {
.name = "96358-502V",
-@@ -3331,6 +3818,10 @@ static const struct board_info __initcon
+@@ -3324,6 +3811,10 @@ static const struct board_info __initcon
&board_nb4_fxc_r2,
&board_ct6373_1,
&board_HW553,
@@ -512,7 +512,7 @@
&board_spw303v,
&board_DVAG3810BN,
#endif
-@@ -3350,13 +3841,37 @@ static void __init boardid_fixup(u8 *boo
+@@ -3343,13 +3834,37 @@ static void __init boardid_fixup(u8 *boo
struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
char *board_name = (char *)bcm63xx_nvram_get_name();
diff --git a/target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch b/target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch
index fc21314639..d07f2958fd 100644
--- a/target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch
+++ b/target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch
@@ -61,7 +61,7 @@
#endif
/*
-@@ -3780,6 +3834,7 @@ static const struct board_info __initcon
+@@ -3773,6 +3827,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
&board_rta770bw,
diff --git a/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch b/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch
index f187ee4505..9b857f24c8 100644
--- a/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch
+++ b/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch
@@ -135,7 +135,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
-@@ -3824,6 +3940,7 @@ static const struct board_info __initcon
+@@ -3817,6 +3933,7 @@ static const struct board_info __initcon
&board_963281TAN,
&board_A4001N1,
&board_dsl_274xb_f1,
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 33d06f9d40..2de0022dd0 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
-@@ -3779,6 +3779,96 @@ static struct board_info __initdata boar
+@@ -3772,6 +3772,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
/*
-@@ -4000,6 +4090,7 @@ static const struct board_info __initcon
+@@ -3993,6 +4083,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6362
&board_nb6,
diff --git a/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch b/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch
index 88286d3801..bb37d560b8 100644
--- a/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch
+++ b/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch
@@ -94,7 +94,7 @@
* known 6328 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6328
-@@ -4254,6 +4341,9 @@ static const struct board_info __initcon
+@@ -4247,6 +4334,9 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_3368
&board_cvg834g,
#endif
diff --git a/target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch b/target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch
index 7f407dae49..26e27b20e2 100644
--- a/target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch
+++ b/target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch
@@ -95,7 +95,7 @@
#endif
/*
-@@ -4343,6 +4431,7 @@ static const struct board_info __initcon
+@@ -4336,6 +4424,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,
diff --git a/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch b/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
index 8efc437393..5c40a9f14b 100644
--- a/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
+++ b/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4423,6 +4423,75 @@ static struct board_info __initdata boar
+@@ -4416,6 +4416,75 @@ static struct board_info __initdata boar
#endif
/*
@@ -76,7 +76,7 @@
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -4507,6 +4576,9 @@ static const struct board_info __initcon
+@@ -4500,6 +4569,9 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
#endif
diff --git a/target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch b/target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch
index 41722961a3..a3990383e8 100644
--- a/target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch
+++ b/target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch
@@ -60,7 +60,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
#endif
/*
-@@ -4543,6 +4588,7 @@ static const struct board_info __initcon
+@@ -4536,6 +4581,7 @@ static const struct board_info __initcon
&board_96348A_122,
&board_CPVA502plus,
&board_96348W3,
diff --git a/target/linux/brcm63xx/patches-3.14/559-board_vw6339gu.patch b/target/linux/brcm63xx/patches-3.14/559-board_vw6339gu.patch
index b7547c6120..3645db61f0 100644
--- a/target/linux/brcm63xx/patches-3.14/559-board_vw6339gu.patch
+++ b/target/linux/brcm63xx/patches-3.14/559-board_vw6339gu.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4534,6 +4534,108 @@ static struct board_info __initdata boar
+@@ -4527,6 +4527,108 @@ static struct board_info __initdata boar
},
},
};
@@ -109,7 +109,7 @@
#endif
/*
-@@ -4624,6 +4726,7 @@ static const struct board_info __initcon
+@@ -4617,6 +4719,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963269bhr,
diff --git a/target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch b/target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch
index 0c337f1c3b..2b83137b2a 100644
--- a/target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch
+++ b/target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4471,6 +4471,131 @@ static struct board_info __initdata boar
+@@ -4464,6 +4464,131 @@ static struct board_info __initdata boar
* known 63268/63269 boards
*/
#ifdef CONFIG_BCM63XX_CPU_63268
@@ -132,7 +132,7 @@
static struct board_info __initdata board_963269bhr = {
.name = "963269BHR",
.expected_cpu_id = 0x63268,
-@@ -4725,6 +4850,7 @@ static const struct board_info __initcon
+@@ -4718,6 +4843,7 @@ static const struct board_info __initcon
&board_96368mvngr,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
diff --git a/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch b/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch
index 4769ecb78e..eb0a2e6dfb 100644
--- a/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch
+++ b/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch
@@ -8,7 +8,7 @@
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
-@@ -4465,6 +4466,99 @@ static struct board_info __initdata boar
+@@ -4458,6 +4459,99 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
@@ -108,7 +108,7 @@
#endif
/*
-@@ -4848,6 +4942,7 @@ static const struct board_info __initcon
+@@ -4841,6 +4935,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,