From 16883252cf690554163c1696bcfd26894d1741f9 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Mon, 1 Dec 2014 00:51:12 +0000 Subject: brcm63xx: add DT support for DSL-2740B/DSL-2741B rev F1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43451 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/brcm63xx/dts/dsl-274xb-f.dts | 8 ++++++++ target/linux/brcm63xx/image/Makefile | 6 +++--- .../linux/brcm63xx/patches-3.14/524-board_dsl_274xb_rev_f.patch | 8 ++++++++ target/linux/brcm63xx/patches-3.14/531-board_AR-5387un.patch | 2 +- target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch | 2 +- target/linux/brcm63xx/profiles/d-link.mk | 9 +++++++++ 6 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 target/linux/brcm63xx/dts/dsl-274xb-f.dts diff --git a/target/linux/brcm63xx/dts/dsl-274xb-f.dts b/target/linux/brcm63xx/dts/dsl-274xb-f.dts new file mode 100644 index 0000000000..a17f9882f8 --- /dev/null +++ b/target/linux/brcm63xx/dts/dsl-274xb-f.dts @@ -0,0 +1,8 @@ +/dts-v1/; + +/include/ "bcm6328.dtsi" + +/ { + model = "D-Link DSL-2740B/DSL-2741B rev F1"; + compatible = "d-link,dsl-274xb-f", "brcm,bcm6328"; +}; diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile index 26063e9615..39dfb0a516 100755 --- a/target/linux/brcm63xx/image/Makefile +++ b/target/linux/brcm63xx/image/Makefile @@ -210,9 +210,6 @@ define Image/Build $(call Image/Build/CFE,$(1),D-4P-W,6348,DSL2640B-B2) # D-Link DSL-2650U $(call Image/Build/CFE,$(1),96358VW2,6358,DSL2650U) - # D-Link DSL-2740B/DSL-2741B, rev F1 - $(call Image/Build/CFE,$(1),AW4339U,6328,DSL274XB-F1-EU,,--signature2="4.06.01.EUF1" --pad 4) - $(call Image/Build/CFE,$(1),AW4339U,6328,DSL274XB-F1-AU,,--signature2="4.06.01.AUF1" --pad 4) # TP-Link 8900GB $(call Image/Build/CFE,$(1),96348GW-11,6348,TD8900GB,$(shell printf 'PRID\x89\x10\x00\x02')) @@ -295,6 +292,9 @@ $(eval $(call ImageDTB,CFEDTB,WAP5813n,wap-5813n,96369R-1231N,6368,WAP-5813n,--p $(eval $(call ImageDTB,CFEDTB,DSL274XB_C,dsl-274xb-c,96358GW,6358,DSL274XB-C2)) # D-Link DSL-2740B/DSL-2741B, rev C3 $(eval $(call ImageDTB,CFEDTB,DSL274XB_C,dsl-274xb-c,AW4139,6358,DSL274XB-C3)) +# D-Link DSL-2740B/DSL-2741B, rev F1 +$(eval $(call ImageDTB,CFEDTB,DSL274XB_F,dsl-274xb-f,AW4339U,6328,DSL274XB-F1-EU,--signature2 "4.06.01.EUF1" --pad 4)) +$(eval $(call ImageDTB,CFEDTB,DSL274XB_F,dsl-274xb-f,AW4339U,6328,DSL274XB-F1-AU,--signature2 "4.06.01.AUF1" --pad 4)) # D-Link DVA-G3810BN/TL $(eval $(call ImageDTB,CFEDTB,DVAG3810BN,dva-g3810bn_tl,96358VW,6358,DVAG3810BN)) # Davolink DV-201AMR 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 97c42dfdff..9dc48c5298 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 @@ -130,3 +130,11 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link #endif #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, +@@ -2742,6 +2870,7 @@ static struct of_device_id const bcm963x + #ifdef CONFIG_BCM63XX_CPU_6328 + { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, + { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, ++ { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, + #endif + #ifdef CONFIG_BCM63XX_CPU_6338 + { .compatible = "brcm,bcm96338gw", .data = &board_96338gw, }, 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 1e5f9c298f..82d6c807a5 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 @@ -129,6 +129,6 @@ { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, + { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, + { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, #endif #ifdef CONFIG_BCM63XX_CPU_6338 - { .compatible = "brcm,bcm96338gw", .data = &board_96338gw, }, 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 a974aa34ce..c5da9173cb 100644 --- a/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch +++ b/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch @@ -144,9 +144,9 @@ Signed-off-by: Marcin Jurkowski #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, @@ -3576,6 +3693,7 @@ static struct of_device_id const bcm963x - { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, + { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, + { .compatible = "sagem,f@st2704v2", .data = &board_FAST2704V2, }, #endif #ifdef CONFIG_BCM63XX_CPU_6338 diff --git a/target/linux/brcm63xx/profiles/d-link.mk b/target/linux/brcm63xx/profiles/d-link.mk index f2eedd6637..69c2fc8639 100644 --- a/target/linux/brcm63xx/profiles/d-link.mk +++ b/target/linux/brcm63xx/profiles/d-link.mk @@ -14,6 +14,15 @@ define Profile/DSL274XB_C/Description endef $(eval $(call Profile,DSL274XB_C)) +define Profile/DSL274XB_F + NAME:=D-Link DSL-2740B/DSL-2741B rev F1 + PACKAGES:=kmod-ath9k wpad-mini +endef +define Profile/DSL274XB_F/Description + Package set optimized for DSL-2740B/DSL-2741B rev F1. +endef +$(eval $(call Profile,DSL274XB_F)) + define Profile/DVAG3810BN NAME:=D-Link DVA-G3810BN/TL PACKAGES:=kmod-b43 wpad-mini \ -- cgit v1.2.3