From 3cfc909c54c07d5a24d9a1a7496142b82d580878 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Sat, 1 Apr 2017 10:46:44 +0200 Subject: [PATCH] ramips: rename Digineo AC1200 Pro to ZBT-WG3526 32MB The Digineo AC1200 Pro is the 32MB flash variant of the ZBT-WG3526 with unpopulated/exposed sdhci slot. Rename to board to the OEM/ODM name and add the sdhci kernel module to use it for multiple clones. Signed-off-by: Mathias Kresin --- .../ramips/base-files/etc/board.d/02_network | 2 +- target/linux/ramips/base-files/etc/diag.sh | 12 ++++++------ target/linux/ramips/base-files/lib/ramips.sh | 6 +++--- .../ramips/base-files/lib/upgrade/platform.sh | 2 +- target/linux/ramips/dts/ZBT-WG3526-16M.dts | 4 ---- .../dts/{AC1200pro.dts => ZBT-WG3526-32M.dts} | 6 +----- target/linux/ramips/dts/ZBT-WG3526.dtsi | 3 ++- target/linux/ramips/image/mt7621.mk | 17 +++++++++-------- 8 files changed, 23 insertions(+), 29 deletions(-) rename target/linux/ramips/dts/{AC1200pro.dts => ZBT-WG3526-32M.dts} (51%) diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index 391a8b69c4fc..016d293cf8a3 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -72,7 +72,6 @@ ramips_setup_interfaces() ucidef_set_interface_lan "eth0.2" ;; 3g-6200n|\ - ac1200pro|\ ai-br100|\ d240|\ db-wrt01|\ @@ -116,6 +115,7 @@ ramips_setup_interfaces() zbt-we826|\ zbt-wg2626|\ zbt-wg3526-16M|\ + zbt-wg3526-32M|\ zbt-wr8305rt) ucidef_add_switch "switch0" \ "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0" diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index 999ad9fc4e06..8b5e260f1f45 100644 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -58,7 +58,10 @@ get_status_led() { wn3000rpv3) status_led="$board:red:power" ;; - ac1200pro|\ + ai-br100|\ + ht-tm02) + status_led="$board:blue:wlan" + ;; all0239-3g|\ dcs-930|\ dir-300-b1|\ @@ -82,10 +85,6 @@ get_status_led() { zbt-wg2626) status_led="$board:green:status" ;; - ai-br100|\ - ht-tm02) - status_led="$board:blue:wlan" - ;; asl26555-8M|\ asl26555-16M) status_led="asl26555:green:power" @@ -274,7 +273,8 @@ get_status_led() { zbt-cpe102) status_led="$board:green:4g-0" ;; - zbt-wg3526-16M) + zbt-wg3526-16M|\ + zbt-wg3526-32M) status_led="zbt-wg3526:green:status" ;; esac diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index d0abd2db2b4d..3342a8f0c40b 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -130,9 +130,6 @@ ramips_board_detect() { *"DCS-930L B1") name="dcs-930l-b1" ;; - *"Digineo AC1200 Pro") - name="ac1200pro" - ;; *"DIR-300 B1") name="dir-300-b1" ;; @@ -664,6 +661,9 @@ ramips_board_detect() { *"ZBT-WG3526 (16M)") name="zbt-wg3526-16M" ;; + *"ZBT-WG3526 (32M)") + name="zbt-wg3526-32M" + ;; *"ZBT-WR8305RT") name="zbt-wr8305rt" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index f329b434e52e..8c7f9591cebe 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -17,7 +17,6 @@ platform_check_image() { 3g150b|\ 3g300m|\ a5-v11|\ - ac1200pro|\ ai-br100|\ air3gii|\ all0239-3g|\ @@ -197,6 +196,7 @@ platform_check_image() { zbt-we826|\ zbt-wg2626|\ zbt-wg3526-16M|\ + zbt-wg3526-32M|\ zbt-wr8305rt|\ zte-q7|\ youku-yk1) diff --git a/target/linux/ramips/dts/ZBT-WG3526-16M.dts b/target/linux/ramips/dts/ZBT-WG3526-16M.dts index fb644502071d..1e2f1525028f 100644 --- a/target/linux/ramips/dts/ZBT-WG3526-16M.dts +++ b/target/linux/ramips/dts/ZBT-WG3526-16M.dts @@ -9,7 +9,3 @@ &firmware { reg = <0x50000 0xfb0000>; }; - -&status_led { - label = "zbt-wg3526:green:status"; -}; diff --git a/target/linux/ramips/dts/AC1200pro.dts b/target/linux/ramips/dts/ZBT-WG3526-32M.dts similarity index 51% rename from target/linux/ramips/dts/AC1200pro.dts rename to target/linux/ramips/dts/ZBT-WG3526-32M.dts index fbec81844025..99a4b45824ba 100644 --- a/target/linux/ramips/dts/AC1200pro.dts +++ b/target/linux/ramips/dts/ZBT-WG3526-32M.dts @@ -3,13 +3,9 @@ #include "ZBT-WG3526.dtsi" / { - model = "Digineo AC1200 Pro"; + model = "ZBT-WG3526 (32M)"; }; &firmware { reg = <0x50000 0x1fb0000>; }; - -&status_led { - label = "ac1200pro:green:status"; -}; diff --git a/target/linux/ramips/dts/ZBT-WG3526.dtsi b/target/linux/ramips/dts/ZBT-WG3526.dtsi index 582e42083920..5e195fb8120d 100644 --- a/target/linux/ramips/dts/ZBT-WG3526.dtsi +++ b/target/linux/ramips/dts/ZBT-WG3526.dtsi @@ -35,7 +35,8 @@ gpio-leds { compatible = "gpio-leds"; - status_led: status { + status { + label = "zbt-wg3526:green:status"; gpios = <&gpio0 24 1>; }; }; diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index ae5bf5e1738f..b57552a6f4c3 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -34,14 +34,6 @@ define Device/11acnas endef TARGET_DEVICES += 11acnas -define Device/ac1200pro - DTS := AC1200pro - IMAGE_SIZE := $(ralink_default_fw_size_32M) - DEVICE_TITLE := Digineo AC1200 Pro - DEVICE_PACKAGES := kmod-usb3 kmod-ata-core kmod-ata-ahci -endef -TARGET_DEVICES += ac1200pro - define Device/dir-860l-b1 DTS := DIR-860L-B1 BLOCKSIZE := 64k @@ -270,6 +262,15 @@ define Device/zbt-wg3526-16M endef TARGET_DEVICES += zbt-wg3526-16M +define Device/zbt-wg3526-32M + DTS := ZBT-WG3526-32M + IMAGE_SIZE := $(ralink_default_fw_size_32M) + SUPPORTED_DEVICES += ac1200pro + DEVICE_TITLE := ZBT WG3526 (32MB flash) + DEVICE_PACKAGES := kmod-usb3 kmod-usb-ledtrig-usbport kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 +endef +TARGET_DEVICES += zbt-wg3526-32M + # FIXME: is this still needed? define Image/Prepare #define Build/Compile -- 2.30.2