From 67f88552ff117244e5389b4132fd927486a42bbb Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Thu, 21 Aug 2014 11:28:32 +0000 Subject: [PATCH] brcm63xx: Add DT support for VR-3025u MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas [jogo: make linux partition writable] Signed-off-by: Jonas Gorski git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42241 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/brcm63xx/dts/vr-3025u.dts | 30 +++++++++++++++++++ target/linux/brcm63xx/image/Makefile | 4 +-- .../patches-3.14/562-board_VR-3025u.patch | 5 ++-- .../patches-3.14/563-board_VR-3025un.patch | 4 +-- .../564-board_P870HW-51a_v2.patch | 4 +-- .../patches-3.14/565-board_hw520.patch | 2 +- .../patches-3.14/566-board_A4001N.patch | 2 +- .../patches-3.14/567-board_dsl-2751b_e1.patch | 2 +- target/linux/brcm63xx/profiles/comtrend.mk | 10 +++++++ 9 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 target/linux/brcm63xx/dts/vr-3025u.dts diff --git a/target/linux/brcm63xx/dts/vr-3025u.dts b/target/linux/brcm63xx/dts/vr-3025u.dts new file mode 100644 index 0000000000..86fde1c7d2 --- /dev/null +++ b/target/linux/brcm63xx/dts/vr-3025u.dts @@ -0,0 +1,30 @@ +/dts-v1/; + +/include/ "bcm6368.dtsi" + +/ { + model = "Comtrend VR-3025u"; + compatible = "comtrend,vr-3025u", "brcm,bcm6368"; +}; + +&pflash { + status = "ok"; + + linux,part-probe = "bcm63xxpart"; + + cfe@0 { + label = "CFE"; + reg = <0x0000000 0x0020000>; + read-only; + }; + + linux@20000 { + label = "linux"; + reg = <0x0020000 0x1fc0000>; + }; + + nvram@1fe0000 { + label = "nvram"; + reg = <0x1fe0000 0x020000>; + }; +}; diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile index a04709aa16..fc759785dc 100755 --- a/target/linux/brcm63xx/image/Makefile +++ b/target/linux/brcm63xx/image/Makefile @@ -271,8 +271,6 @@ define Image/Build # Sagem F@ST2504n $(call Image/Build/CFE,$(1),F@ST2504n,6362,F@ST2504n,OpenWRT-$(REVISION)) - # Comtrend VR-3025u - $(call Image/Build/CFE,$(1),96368M-1541N,6368,VR-3025u,,--pad 16) # Comtrend VR-3025un $(call Image/Build/CFE,$(1),96368M-1341N,6368,VR-3025un,,--pad 4) # Comtrend WAP-5813n @@ -363,6 +361,8 @@ $(eval $(call CfeImageDTB,CT536_CT5621,ct536plus,96348GW-11,6348,CT536_CT5621)) $(eval $(call CfeImageDTB,CT5365,ct-5365,96348A-122,6348,CT-5365)) # Comtrend CT-6373 $(eval $(call CfeImageDTB,CT6373,ct-6373,CT6373-1,6358,CT-6373)) +# Comtrend VR-3025u +$(eval $(call CfeImageDTB,VR3025u,vr-3025u,96368M-1541N,6368,VR-3025u,,--pad 16 --image-offset 0x20000 --block-size 0x20000)) # D-Link DSL-2740B/DSL-2741B, rev C2 $(eval $(call CfeImageDTB,DSL274XB_C,dsl-274xb-c,96358GW,6358,DSL274XB-C2)) # D-Link DSL-2740B/DSL-2741B, rev C3 diff --git a/target/linux/brcm63xx/patches-3.14/562-board_VR-3025u.patch b/target/linux/brcm63xx/patches-3.14/562-board_VR-3025u.patch index 9bf57b9afa..25b7123c72 100644 --- a/target/linux/brcm63xx/patches-3.14/562-board_VR-3025u.patch +++ b/target/linux/brcm63xx/patches-3.14/562-board_VR-3025u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -4169,6 +4169,116 @@ static struct board_info __initdata boar +@@ -4169,6 +4169,117 @@ static struct board_info __initdata boar .has_ehci0 = 1, }; @@ -15,6 +15,7 @@ + +static struct board_info __initdata board_VR3025u = { + .name = "96368M-1541N", ++ .of_board_id = "comtrend,vr-3025u", + .expected_cpu_id = 0x6368, + + .has_uart0 = 1, @@ -117,7 +118,7 @@ static struct b53_platform_data WAP5813n_b53_pdata = { .alias = "eth0", }; -@@ -4658,6 +4768,7 @@ static const struct board_info __initcon +@@ -4658,6 +4769,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/563-board_VR-3025un.patch b/target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch index bb7597a464..5b18b72e45 100644 --- a/target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch +++ b/target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -4279,6 +4279,116 @@ static struct board_info __initdata boar +@@ -4280,6 +4280,116 @@ static struct board_info __initdata boar }, }; @@ -117,7 +117,7 @@ static struct b53_platform_data WAP5813n_b53_pdata = { .alias = "eth0", }; -@@ -4769,6 +4879,7 @@ static const struct board_info __initcon +@@ -4770,6 +4880,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_VR3025u, diff --git a/target/linux/brcm63xx/patches-3.14/564-board_P870HW-51a_v2.patch b/target/linux/brcm63xx/patches-3.14/564-board_P870HW-51a_v2.patch index 4aefa3380c..3ee2dd5d7a 100644 --- a/target/linux/brcm63xx/patches-3.14/564-board_P870HW-51a_v2.patch +++ b/target/linux/brcm63xx/patches-3.14/564-board_P870HW-51a_v2.patch @@ -96,8 +96,8 @@ + static struct board_info __initdata board_VR3025u = { .name = "96368M-1541N", - .expected_cpu_id = 0x6368, -@@ -4878,6 +4968,7 @@ static const struct board_info __initcon + .of_board_id = "comtrend,vr-3025u", +@@ -4879,6 +4969,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/565-board_hw520.patch b/target/linux/brcm63xx/patches-3.14/565-board_hw520.patch index 7f9292f242..a686ef6a8d 100644 --- a/target/linux/brcm63xx/patches-3.14/565-board_hw520.patch +++ b/target/linux/brcm63xx/patches-3.14/565-board_hw520.patch @@ -57,7 +57,7 @@ static struct board_info __initdata board_HW553 = { .name = "HW553", .expected_cpu_id = 0x6358, -@@ -4952,6 +5002,7 @@ static const struct board_info __initcon +@@ -4953,6 +5003,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_ct6373_1, diff --git a/target/linux/brcm63xx/patches-3.14/566-board_A4001N.patch b/target/linux/brcm63xx/patches-3.14/566-board_A4001N.patch index 6d0611a2b9..0fbb1758db 100644 --- a/target/linux/brcm63xx/patches-3.14/566-board_A4001N.patch +++ b/target/linux/brcm63xx/patches-3.14/566-board_A4001N.patch @@ -96,7 +96,7 @@ static struct board_info __initdata board_A4001N1 = { .name = "963281T_TEF", .expected_cpu_id = 0x6328, -@@ -4953,6 +5042,7 @@ static const struct board_info __initcon +@@ -4954,6 +5043,7 @@ static const struct board_info __initcon &board_AR5381u, &board_AR5387un, &board_963281TAN, diff --git a/target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch b/target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch index bdf7690f4c..2bb41de61a 100644 --- a/target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch +++ b/target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch @@ -142,7 +142,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -5036,6 +5171,7 @@ static const struct board_info __initcon +@@ -5037,6 +5172,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, diff --git a/target/linux/brcm63xx/profiles/comtrend.mk b/target/linux/brcm63xx/profiles/comtrend.mk index 6118c27165..ab9b61253c 100644 --- a/target/linux/brcm63xx/profiles/comtrend.mk +++ b/target/linux/brcm63xx/profiles/comtrend.mk @@ -52,3 +52,13 @@ define Profile/CT6373/Description Package set optimized for CT-6373. endef $(eval $(call Profile,CT6373)) + +define Profile/VR3025u + NAME:=Comtrend VR-3025u + PACKAGES:=kmod-b43 wpad-mini \ + kmod-usb2 kmod-usb-ohci +endef +define Profile/VR3025u/Description + Package set optimized for VR-3025u. +endef +$(eval $(call Profile,VR3025u))