KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

brcm63xx: use dtb board detection for NB6

Browse source 
Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 42127
This commit is contained in:
Jonas Gorski 2014-08-11 11:37:17 +00:00
parent 52b0935efe
commit 862f7fccb0
25 changed files with 44 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
target/linux/brcm63xx/dts/nb6-ser-r0.dts Normal file
View file

@ -0,0 +1,8 @@
/dts-v1/;
/include/ "bcm6362.dtsi"
/ {
model = "SFR neufbox 6 (Sercomm)";
compatible = "sfr,nb6-ser-r0", "brcm,bcm6362";
};

6
target/linux/brcm63xx/image/Makefile
View file

@ -279,9 +279,6 @@ define Image/Build
# Zyxel P870HW-51a v2 # Zyxel P870HW-51a v2
$(call Image/Build/ZyXEL,$(1),96368VVW,P870HW-51a_v2,6368,P870HW-51a_v2,ZyXEL,--signature "ZyXEL_0001") $(call Image/Build/ZyXEL,$(1),96368VVW,P870HW-51a_v2,6368,P870HW-51a_v2,ZyXEL,--signature "ZyXEL_0001")
# Neufbox6
$(call Image/Build/CFE,$(1),NB6-SER-r0,6362,NEUFBOX6,OpenWRT-$(REVISION))
# Sagem F@ST2504n # Sagem F@ST2504n
$(call Image/Build/CFE,$(1),F@ST2504n,6362,F@ST2504n,OpenWRT-$(REVISION)) $(call Image/Build/CFE,$(1),F@ST2504n,6362,F@ST2504n,OpenWRT-$(REVISION))
@ -391,4 +388,7 @@ $(eval $(call HW556ImageDTB,hg556a-a,HW556-A))
$(eval $(call HW556ImageDTB,hg556a-b,HW556-B)) $(eval $(call HW556ImageDTB,hg556a-b,HW556-B))
$(eval $(call HW556ImageDTB,hg556a-c,HW556-C)) $(eval $(call HW556ImageDTB,hg556a-c,HW556-C))
# SFR neufbox 6
$(call $(call CfeImageDTB,nb6-ser-r0,NB6-SER-r0,6362,NEUFBOX6,OpenWRT-$(REVISION)))
$(eval $(call BuildImage)) $(eval $(call BuildImage))

17
target/linux/brcm63xx/patches-3.14/528-board_nb6.patch
View file

@ -17,7 +17,7 @@
#define CT6373_PID_OFFSET 0xff80 #define CT6373_PID_OFFSET 0xff80
#define CT6373_74X164_GPIO_BASE 64 #define CT6373_74X164_GPIO_BASE 64
@@ -2717,6 +2720,104 @@ static struct board_info __initdata boar @@ -2717,6 +2720,105 @@ static struct board_info __initdata boar
}; };
#endif /* CONFIG_BCM63XX_CPU_6358 */ #endif /* CONFIG_BCM63XX_CPU_6358 */
@ -56,6 +56,7 @@
+ +
+static struct board_info __initdata board_nb6 = { +static struct board_info __initdata board_nb6 = {
+ .name = "NB6", + .name = "NB6",
+ .of_board_id = "sfr,nb6-ser-r0",
+ .expected_cpu_id = 0x6362, + .expected_cpu_id = 0x6362,
+ +
+ .has_uart0 = 1, + .has_uart0 = 1,
@ -122,7 +123,7 @@
/* /*
* known 6368 boards * known 6368 boards
*/ */
@@ -2923,6 +3024,10 @@ static const struct board_info __initcon @@ -2923,6 +3025,10 @@ static const struct board_info __initcon
&board_DVAG3810BN, &board_DVAG3810BN,
#endif #endif
@ -133,15 +134,3 @@
#ifdef CONFIG_BCM63XX_CPU_6368 #ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg, &board_96368mvwg,
&board_96368mvngr, &board_96368mvngr,
@@ -2944,6 +3049,11 @@ static void __init boardid_fixup(u8 *boo
}
}
+ if (BCMCPU_IS_6362() && (!strncmp(board_name, "NB6-", sizeof("NB6-") - 1))) {
+ board_name[sizeof("NB6") - 1] = '\0';
+ return ;
+ }
+
/* check if bcm_tag is at 64k offset */
if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) {
/* else try 128k */

2
target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch
View file

@ -58,7 +58,7 @@
static struct board_info __initdata board_rta1025w_16 = { static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16", .name = "RTA1025W_16",
.of_board_id = "dynalink,rta1025w", .of_board_id = "dynalink,rta1025w",
@@ -2992,6 +3043,7 @@ static const struct board_info __initcon @@ -2993,6 +3044,7 @@ static const struct board_info __initcon
&board_96348gw_10, &board_96348gw_10,
&board_96348gw_11, &board_96348gw_11,
&board_FAST2404, &board_FAST2404,

2
target/linux/brcm63xx/patches-3.14/530-board_A4001N1.patch
View file

@ -134,7 +134,7 @@
static struct board_info __initdata board_dsl_274xb_f1 = { static struct board_info __initdata board_dsl_274xb_f1 = {
.name = "AW4339U", .name = "AW4339U",
.expected_cpu_id = 0x6328, .expected_cpu_id = 0x6328,
@@ -3024,6 +3151,7 @@ static const struct board_info __initcon @@ -3025,6 +3152,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328 #ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng, &board_96328avng,
&board_963281TAN, &board_963281TAN,

2
target/linux/brcm63xx/patches-3.14/531-board_AR-5387un.patch
View file

@ -116,7 +116,7 @@
static struct board_info __initdata board_963281TAN = { static struct board_info __initdata board_963281TAN = {
.name = "963281TAN", .name = "963281TAN",
.expected_cpu_id = 0x6328, .expected_cpu_id = 0x6328,
@@ -3150,6 +3259,7 @@ static const struct board_info __initcon @@ -3151,6 +3260,7 @@ static const struct board_info __initcon
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6328 #ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng, &board_96328avng,

2
target/linux/brcm63xx/patches-3.14/532-board_AR-5381u.patch
View file

@ -92,7 +92,7 @@
static struct sprom_fixup __initdata ar5387un_fixups[] = { static struct sprom_fixup __initdata ar5387un_fixups[] = {
{ .offset = 2, .value = 0x05bb }, { .offset = 2, .value = 0x05bb },
{ .offset = 65, .value = 0x1204 }, { .offset = 65, .value = 0x1204 },
@@ -3259,6 +3344,7 @@ static const struct board_info __initcon @@ -3260,6 +3345,7 @@ static const struct board_info __initcon
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6328 #ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng, &board_96328avng,

2
target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch
View file

@ -56,7 +56,7 @@
#endif /* CONFIG_BCM63XX_CPU_6345 */ #endif /* CONFIG_BCM63XX_CPU_6345 */
/* /*
@@ -3358,6 +3407,7 @@ static const struct board_info __initcon @@ -3359,6 +3408,7 @@ static const struct board_info __initcon
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6345 #ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2, &board_96345gw2,

2
target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
View file

@ -504,7 +504,7 @@
/* T-Home Speedport W 303V Typ B */ /* T-Home Speedport W 303V Typ B */
static struct board_info __initdata board_spw303v = { static struct board_info __initdata board_spw303v = {
.name = "96358-502V", .name = "96358-502V",
@@ -3446,6 +3936,10 @@ static const struct board_info __initcon @@ -3447,6 +3937,10 @@ static const struct board_info __initcon
&board_nb4_fxc_r2, &board_nb4_fxc_r2,
&board_ct6373_1, &board_ct6373_1,
&board_HW553, &board_HW553,

2
target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch
View file

@ -61,7 +61,7 @@
#endif /* CONFIG_BCM63XX_CPU_6345 */ #endif /* CONFIG_BCM63XX_CPU_6345 */
/* /*
@@ -3898,6 +3952,7 @@ static const struct board_info __initcon @@ -3899,6 +3953,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6345 #ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2, &board_96345gw2,
&board_rta770bw, &board_rta770bw,

2
target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch
View file

@ -135,7 +135,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
#endif /* CONFIG_BCM63XX_CPU_6328 */ #endif /* CONFIG_BCM63XX_CPU_6328 */
/* /*
@@ -3942,6 +4058,7 @@ static const struct board_info __initcon @@ -3943,6 +4059,7 @@ static const struct board_info __initcon
&board_963281TAN, &board_963281TAN,
&board_A4001N1, &board_A4001N1,
&board_dsl_274xb_f1, &board_dsl_274xb_f1,

4
target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch
View file

@ -6,7 +6,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
--- ---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -3897,6 +3897,96 @@ static struct board_info __initdata boar @@ -3898,6 +3898,96 @@ static struct board_info __initdata boar
.devs = nb6_devices, .devs = nb6_devices,
.num_devs = ARRAY_SIZE(nb6_devices), .num_devs = ARRAY_SIZE(nb6_devices),
}; };
@ -103,7 +103,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
#endif /* CONFIG_BCM63XX_CPU_6362 */ #endif /* CONFIG_BCM63XX_CPU_6362 */
/* /*
@@ -4118,6 +4208,7 @@ static const struct board_info __initcon @@ -4119,6 +4209,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6362 #ifdef CONFIG_BCM63XX_CPU_6362
&board_nb6, &board_nb6,

2
target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch
View file

@ -94,7 +94,7 @@
* known 6328 boards * known 6328 boards
*/ */
#ifdef CONFIG_BCM63XX_CPU_6328 #ifdef CONFIG_BCM63XX_CPU_6328
@@ -4372,6 +4459,9 @@ static const struct board_info __initcon @@ -4373,6 +4460,9 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_3368 #ifdef CONFIG_BCM63XX_CPU_3368
&board_cvg834g, &board_cvg834g,
#endif #endif

2
target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch
View file

@ -95,7 +95,7 @@
#endif /* CONFIG_BCM63XX_CPU_6318 */ #endif /* CONFIG_BCM63XX_CPU_6318 */
/* /*
@@ -4461,6 +4549,7 @@ static const struct board_info __initcon @@ -4462,6 +4550,7 @@ static const struct board_info __initcon
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6318 #ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref, &board_96318ref,

4
target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -4541,6 +4541,75 @@ static struct board_info __initdata boar @@ -4542,6 +4542,75 @@ static struct board_info __initdata boar
#endif /* CONFIG_BCM63XX_CPU_6368 */ #endif /* CONFIG_BCM63XX_CPU_6368 */
/* /*
@ -76,7 +76,7 @@
* all boards * all boards
*/ */
static const struct board_info __initconst *bcm963xx_boards[] = { static const struct board_info __initconst *bcm963xx_boards[] = {
@@ -4625,6 +4694,9 @@ static const struct board_info __initcon @@ -4626,6 +4695,9 @@ static const struct board_info __initcon
&board_96368mvwg, &board_96368mvwg,
&board_96368mvngr, &board_96368mvngr,
#endif #endif

2
target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch
View file

@ -61,7 +61,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
/* BT Voyager 2110 */ /* BT Voyager 2110 */
static struct board_info __initdata board_V2110 = { static struct board_info __initdata board_V2110 = {
@@ -4661,6 +4707,7 @@ static const struct board_info __initcon @@ -4662,6 +4708,7 @@ static const struct board_info __initcon
&board_96348A_122, &board_96348A_122,
&board_CPVA502plus, &board_CPVA502plus,
&board_96348W3, &board_96348W3,

4
target/linux/brcm63xx/patches-3.14/559-board_vw6339gu.patch
View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -4653,6 +4653,108 @@ static struct board_info __initdata boar @@ -4654,6 +4654,108 @@ static struct board_info __initdata boar
}, },
}, },
}; };
@ -109,7 +109,7 @@
#endif /* CONFIG_BCM63XX_CPU_63268 */ #endif /* CONFIG_BCM63XX_CPU_63268 */
/* /*
@@ -4743,6 +4845,7 @@ static const struct board_info __initcon @@ -4744,6 +4846,7 @@ static const struct board_info __initcon
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_63268 #ifdef CONFIG_BCM63XX_CPU_63268
&board_963269bhr, &board_963269bhr,

4
target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch
View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -4590,6 +4590,131 @@ static struct board_info __initdata boar @@ -4591,6 +4591,131 @@ static struct board_info __initdata boar
* known 63268/63269 boards * known 63268/63269 boards
*/ */
#ifdef CONFIG_BCM63XX_CPU_63268 #ifdef CONFIG_BCM63XX_CPU_63268
@ -132,7 +132,7 @@
static struct board_info __initdata board_963269bhr = { static struct board_info __initdata board_963269bhr = {
.name = "963269BHR", .name = "963269BHR",
.expected_cpu_id = 0x63268, .expected_cpu_id = 0x63268,
@@ -4844,6 +4969,7 @@ static const struct board_info __initcon @@ -4845,6 +4970,7 @@ static const struct board_info __initcon
&board_96368mvngr, &board_96368mvngr,
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_63268 #ifdef CONFIG_BCM63XX_CPU_63268

4
target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch
View file

@ -8,7 +8,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h> #include <linux/spi/spi_gpio.h>
@@ -4584,6 +4585,117 @@ static struct board_info __initdata boar @@ -4585,6 +4586,117 @@ static struct board_info __initdata boar
.has_ohci0 = 1, .has_ohci0 = 1,
.has_ehci0 = 1, .has_ehci0 = 1,
}; };
@ -126,7 +126,7 @@
#endif /* CONFIG_BCM63XX_CPU_6368 */ #endif /* CONFIG_BCM63XX_CPU_6368 */
/* /*
@@ -4967,6 +5079,7 @@ static const struct board_info __initcon @@ -4968,6 +5080,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368 #ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg, &board_96368mvwg,
&board_96368mvngr, &board_96368mvngr,

4
target/linux/brcm63xx/patches-3.14/562-board_VR-3025u.patch
View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -4586,6 +4586,116 @@ static struct board_info __initdata boar @@ -4587,6 +4587,116 @@ static struct board_info __initdata boar
.has_ehci0 = 1, .has_ehci0 = 1,
}; };
@ -117,7 +117,7 @@
static struct b53_platform_data WAP5813n_b53_pdata = { static struct b53_platform_data WAP5813n_b53_pdata = {
.alias = "eth0", .alias = "eth0",
}; };
@@ -5079,6 +5189,7 @@ static const struct board_info __initcon @@ -5080,6 +5190,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368 #ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg, &board_96368mvwg,
&board_96368mvngr, &board_96368mvngr,

4
target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch
View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -4696,6 +4696,116 @@ static struct board_info __initdata boar @@ -4697,6 +4697,116 @@ static struct board_info __initdata boar
}, },
}; };
@ -117,7 +117,7 @@
static struct b53_platform_data WAP5813n_b53_pdata = { static struct b53_platform_data WAP5813n_b53_pdata = {
.alias = "eth0", .alias = "eth0",
}; };
@@ -5190,6 +5300,7 @@ static const struct board_info __initcon @@ -5191,6 +5301,7 @@ static const struct board_info __initcon
&board_96368mvwg, &board_96368mvwg,
&board_96368mvngr, &board_96368mvngr,
&board_VR3025u, &board_VR3025u,

4
target/linux/brcm63xx/patches-3.14/564-board_P870HW-51a_v2.patch
View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -4595,6 +4595,96 @@ static struct sprom_fixup __initdata vr3 @@ -4596,6 +4596,96 @@ static struct sprom_fixup __initdata vr3
{ .offset = 115, .value = 0xfad9 }, { .offset = 115, .value = 0xfad9 },
}; };
@ -97,7 +97,7 @@
static struct board_info __initdata board_VR3025u = { static struct board_info __initdata board_VR3025u = {
.name = "96368M-1541N", .name = "96368M-1541N",
.expected_cpu_id = 0x6368, .expected_cpu_id = 0x6368,
@@ -5299,6 +5389,7 @@ static const struct board_info __initcon @@ -5300,6 +5390,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368 #ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg, &board_96368mvwg,
&board_96368mvngr, &board_96368mvngr,

2
target/linux/brcm63xx/patches-3.14/565-board_hw520.patch
View file

@ -57,7 +57,7 @@
static struct board_info __initdata board_HW553 = { static struct board_info __initdata board_HW553 = {
.name = "HW553", .name = "HW553",
.expected_cpu_id = 0x6358, .expected_cpu_id = 0x6358,
@@ -5372,6 +5422,7 @@ static const struct board_info __initcon @@ -5373,6 +5423,7 @@ static const struct board_info __initcon
&board_nb4_fxc_r1, &board_nb4_fxc_r1,
&board_nb4_fxc_r2, &board_nb4_fxc_r2,
&board_ct6373_1, &board_ct6373_1,

2
target/linux/brcm63xx/patches-3.14/566-board_A4001N.patch
View file

@ -96,7 +96,7 @@
static struct board_info __initdata board_A4001N1 = { static struct board_info __initdata board_A4001N1 = {
.name = "963281T_TEF", .name = "963281T_TEF",
.expected_cpu_id = 0x6328, .expected_cpu_id = 0x6328,
@@ -5370,6 +5459,7 @@ static const struct board_info __initcon @@ -5371,6 +5460,7 @@ static const struct board_info __initcon
&board_AR5381u, &board_AR5381u,
&board_AR5387un, &board_AR5387un,
&board_963281TAN, &board_963281TAN,

2
target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch
View file

@ -142,7 +142,7 @@
#endif /* CONFIG_BCM63XX_CPU_6318 */ #endif /* CONFIG_BCM63XX_CPU_6318 */
/* /*
@@ -5453,6 +5588,7 @@ static const struct board_info __initcon @@ -5454,6 +5589,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6318 #ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref, &board_96318ref,
&board_96318ref_p300, &board_96318ref_p300,