From a0b8c601341bfc8684f962e27715dd18a4d667a8 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 17 Aug 2015 05:58:15 +0000 Subject: [PATCH] ramips: fix Xiaomi MiWiFi Mini board, image and profile names The following patch: * changes board name from "xiaomi-miwifi-mini" to "miwifi-mini" * changes filenames of dts and profile * fixes LED names in dts file and base-files scripts * removes manufacturer name from image filename for Xiaomi MiWiFi Mini device. Signed-off-by: Piotr Dymacz SVN-Revision: 46617 --- target/linux/ramips/base-files/etc/board.d/01_leds | 4 ++-- target/linux/ramips/base-files/etc/board.d/02_network | 2 +- target/linux/ramips/base-files/etc/diag.sh | 4 ++-- target/linux/ramips/base-files/lib/ramips.sh | 2 +- target/linux/ramips/base-files/lib/upgrade/platform.sh | 2 +- .../dts/{XIAOMI-MIWIFI-MINI.dts => MIWIFI-MINI.dts} | 8 ++++---- target/linux/ramips/image/Makefile | 4 ++-- .../mt7620/profiles/{xiaomi-miwifi-mini.mk => xiaomi.mk} | 6 +++--- 8 files changed, 16 insertions(+), 16 deletions(-) rename target/linux/ramips/dts/{XIAOMI-MIWIFI-MINI.dts => MIWIFI-MINI.dts} (92%) rename target/linux/ramips/mt7620/profiles/{xiaomi-miwifi-mini.mk => xiaomi.mk} (71%) diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index bb990c97ed..7bd52e19bb 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -256,8 +256,8 @@ case $board in wt3020) ucidef_set_led_default "power" "power" "nexx:blue:power" "0" ;; - xiaomi-miwifi-mini) - ucidef_set_led_default "power" "power" "xiaomi:red:status" "1" + miwifi-mini) + ucidef_set_led_default "power" "power" "miwifi-mini:red:status" "1" ;; y1 |\ y1s) 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 42447d4d14..44aebcf6e7 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -144,7 +144,7 @@ ramips_setup_interfaces() wsr-600 | \ wsr-1166 | \ wt1520 | \ - xiaomi-miwifi-mini |\ + miwifi-mini |\ y1) ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_add_switch "switch0" "1" "1" diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index 019bbbb2a8..cb3d851941 100644 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -233,8 +233,8 @@ get_status_led() { xdxrn502j) status_led="xdxrn502j:green:power" ;; - xiaomi-mini) - status_led="xiaomi:red:status" + miwifi-mini) + status_led="miwifi-mini:red:status" ;; f7c027) status_led="belkin:orange:status" diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 436ed092e5..fa90243193 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -395,7 +395,7 @@ ramips_board_detect() { name="ncs601w" ;; *"Xiaomi MiWiFi Mini") - name="xiaomi-miwifi-mini" + name="miwifi-mini" ;; *"Sercomm NA930") name="na930" diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 1021123693..f46155ff43 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -123,7 +123,7 @@ platform_check_image() { wt3020 |\ x5 |\ x8 |\ - xiaomi-miwifi-mini |\ + miwifi-mini |\ y1 |\ y1s |\ zte-q7 |\ diff --git a/target/linux/ramips/dts/XIAOMI-MIWIFI-MINI.dts b/target/linux/ramips/dts/MIWIFI-MINI.dts similarity index 92% rename from target/linux/ramips/dts/XIAOMI-MIWIFI-MINI.dts rename to target/linux/ramips/dts/MIWIFI-MINI.dts index c1acab4299..fa9846c69a 100644 --- a/target/linux/ramips/dts/XIAOMI-MIWIFI-MINI.dts +++ b/target/linux/ramips/dts/MIWIFI-MINI.dts @@ -3,7 +3,7 @@ /include/ "mt7620a.dtsi" / { - compatible = "XIAOMI MIWIFI MINI", "ralink,mt7620a-soc"; + compatible = "xiaomi,miwifi-mini", "ralink,mt7620a-soc"; model = "Xiaomi MiWiFi Mini"; chosen { @@ -120,17 +120,17 @@ compatible = "gpio-leds"; blue { - label = "xiaomi:blue:status"; + label = "miwifi-mini:blue:status"; gpios = <&gpio1 0 1>; }; yellow { - label = "xiaomi:yellow:status"; + label = "miwifi-mini:yellow:status"; gpios = <&gpio1 2 1>; }; red { - label = "xiaomi:red:status"; + label = "miwifi-mini:red:status"; gpios = <&gpio1 5 1>; }; }; diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index 79a97a5ccb..232742c68b 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -878,7 +878,7 @@ Image/Build/Profile/WMR300=$(call BuildFirmware/Default8M/$(1),$(1),wmr-300,WMR3 Image/Build/Profile/RT-N14U=$(call BuildFirmware/Default8M/$(1),$(1),rt-n14u,RT-N14U) Image/Build/Profile/WRTNODE=$(call BuildFirmware/Default16M/$(1),$(1),wrtnode,WRTNODE) Image/Build/Profile/WT3020=$(call BuildFirmware/PorayDualSize/$(1),$(1),wt3020,WT3020) -Image/Build/Profile/XIAOMI-MIWIFI-MINI=$(call BuildFirmware/Default16M/$(1),$(1),xiaomi-miwifi-mini,XIAOMI-MIWIFI-MINI) +Image/Build/Profile/MIWIFI-MINI=$(call BuildFirmware/Default16M/$(1),$(1),miwifi-mini,MIWIFI-MINI) Image/Build/Profile/ZTE-Q7=$(call BuildFirmware/Default8M/$(1),$(1),zte-q7,ZTE-Q7) Image/Build/Profile/ZBT-WA05=$(call BuildFirmware/Default8M/$(1),$(1),zbt-wa05,ZBT-WA05) Image/Build/Profile/ZBT-WR8305RT=$(call BuildFirmware/Default8M/$(1),$(1),zbt-wr8305rt,ZBT-WR8305RT) @@ -912,7 +912,7 @@ define Image/Build/Profile/Default $(call Image/Build/Profile/RT-N14U,$(1)) $(call Image/Build/Profile/WRTNODE,$(1)) $(call Image/Build/Profile/WT3020,$(1)) - $(call Image/Build/Profile/XIAOMI-MIWIFI-MINI,$(1)) + $(call Image/Build/Profile/MIWIFI-MINI,$(1)) $(call Image/Build/Profile/ZTE-Q7,$(1)) $(call Image/Build/Profile/ZBT-WA05,$(1)) $(call Image/Build/Profile/ZBT-WR8305RT,$(1)) diff --git a/target/linux/ramips/mt7620/profiles/xiaomi-miwifi-mini.mk b/target/linux/ramips/mt7620/profiles/xiaomi.mk similarity index 71% rename from target/linux/ramips/mt7620/profiles/xiaomi-miwifi-mini.mk rename to target/linux/ramips/mt7620/profiles/xiaomi.mk index 47819b2aaa..47f6d499dd 100644 --- a/target/linux/ramips/mt7620/profiles/xiaomi-miwifi-mini.mk +++ b/target/linux/ramips/mt7620/profiles/xiaomi.mk @@ -5,14 +5,14 @@ # See /LICENSE for more information. # -define Profile/XIAOMI-MIWIFI-MINI +define Profile/MIWIFI-MINI NAME:=Xiaomi MiWiFi Mini PACKAGES:=\ kmod-usb-core kmod-usb-dwc2 kmod-usb2 kmod-usb-ohci \ kmod-mt76 endef -define Profile/XIAOMI-MIWIFI-MINI/Description +define Profile/MIWIFI-MINI/Description Support for Xiaomi MiWiFi Mini routers endef -$(eval $(call Profile,XIAOMI-MIWIFI-MINI)) +$(eval $(call Profile,MIWIFI-MINI)) -- 2.30.2