From 2fe5cf2bd691b94a54651f95ea541194d6a4367c Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 17 Aug 2015 06:01:06 +0000 Subject: [PATCH] ramips: fix 7Links PX-4885 dts{, i}, board, image and profile names The following patch changes 7Links PX-4885 dts{,i} filenames, board, image and profile names from "PX4885" to "PX-4885" (for consistency). Signed-off-by: Piotr Dymacz SVN-Revision: 46629 --- target/linux/ramips/base-files/etc/board.d/01_leds | 6 +++--- 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 +- target/linux/ramips/dts/{PX4885-4M.dts => PX-4885-4M.dts} | 2 +- target/linux/ramips/dts/{PX4885-8M.dts => PX-4885-8M.dts} | 2 +- target/linux/ramips/dts/{PX4885.dtsi => PX-4885.dtsi} | 6 +++--- target/linux/ramips/image/Makefile | 4 ++-- target/linux/ramips/rt305x/profiles/sevenlinks.mk | 8 +++----- 9 files changed, 17 insertions(+), 19 deletions(-) rename target/linux/ramips/dts/{PX4885-4M.dts => PX-4885-4M.dts} (96%) rename target/linux/ramips/dts/{PX4885-8M.dts => PX-4885-8M.dts} (96%) rename target/linux/ramips/dts/{PX4885.dtsi => PX-4885.dtsi} (86%) 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 19e79a8875..1456be1abf 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -175,9 +175,9 @@ case $board in set_wifi_led "miniembplug:green:wlan" set_usb_led "miniembplug:green:mobile" ;; - px4885) - set_wifi_led "7links:orange:wifi" - set_usb_led "7links:blue:storage" + px-4885) + set_wifi_led "px-4885:orange:wifi" + set_usb_led "px-4885:blue:storage" ;; pbr-m1) ucidef_set_led_netdev "internet" "internet" "pbr-m1:green:internet" "eth0.2" diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index c8014bf20e..f63cf31cb3 100644 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -134,8 +134,8 @@ get_status_led() { pwh2004) status_led="pwh2004:green:power" ;; - px4885) - status_led="7links:orange:wifi" + px-4885) + status_led="px-4885:orange:wifi" ;; re6500) status_led="linksys:orange:wifi" diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 98bd09455d..9e7e73fb3e 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -14,7 +14,7 @@ ramips_board_detect() { case "$machine" in *"7Links PX-4885") - name="px4885" + name="px-4885" ;; *"8devices Carambola") name="carambola" diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index e347d6f021..b5e0f5f061 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -80,7 +80,7 @@ platform_check_image() { rt5350f-olinuxino | \ rt5350f-olinuxino-evb | \ psr-680w | \ - px4885 | \ + px-4885 | \ re6500 | \ rp-n53 | \ rt-g32-b1 | \ diff --git a/target/linux/ramips/dts/PX4885-4M.dts b/target/linux/ramips/dts/PX-4885-4M.dts similarity index 96% rename from target/linux/ramips/dts/PX4885-4M.dts rename to target/linux/ramips/dts/PX-4885-4M.dts index 33f167dcd5..1f79a3cb36 100644 --- a/target/linux/ramips/dts/PX4885-4M.dts +++ b/target/linux/ramips/dts/PX-4885-4M.dts @@ -1,6 +1,6 @@ /dts-v1/; -/include/ "PX4885.dtsi" +/include/ "PX-4885.dtsi" / { palmbus@10000000 { diff --git a/target/linux/ramips/dts/PX4885-8M.dts b/target/linux/ramips/dts/PX-4885-8M.dts similarity index 96% rename from target/linux/ramips/dts/PX4885-8M.dts rename to target/linux/ramips/dts/PX-4885-8M.dts index b8015ab8f0..4c94a1113c 100644 --- a/target/linux/ramips/dts/PX4885-8M.dts +++ b/target/linux/ramips/dts/PX-4885-8M.dts @@ -1,6 +1,6 @@ /dts-v1/; -/include/ "PX4885.dtsi" +/include/ "PX-4885.dtsi" / { palmbus@10000000 { diff --git a/target/linux/ramips/dts/PX4885.dtsi b/target/linux/ramips/dts/PX-4885.dtsi similarity index 86% rename from target/linux/ramips/dts/PX4885.dtsi rename to target/linux/ramips/dts/PX-4885.dtsi index 50f4b9edd6..350c1a659e 100644 --- a/target/linux/ramips/dts/PX4885.dtsi +++ b/target/linux/ramips/dts/PX-4885.dtsi @@ -1,7 +1,7 @@ /include/ "rt5350.dtsi" / { - compatible = "PX4885", "ralink,rt5350-soc"; + compatible = "PX-4885", "ralink,rt5350-soc"; model = "7Links PX-4885"; pinctrl { @@ -42,12 +42,12 @@ compatible = "gpio-leds"; orange { - label = "7links:orange:wifi"; + label = "px-4885:orange:wifi"; gpios = <&gpio0 18 1>; }; blue { - label = "7links:blue:storage"; + label = "px-4885:blue:storage"; gpios = <&gpio0 19 1>; }; }; diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index 2539b5a29d..2f4d4cbc61 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -582,7 +582,7 @@ Image/Build/Profile/PSR-680W=$(call BuildFirmware/Default4M/$(1),$(1),psr-680w,P Image/Build/Profile/PWH2004=$(call BuildFirmware/Default8M/$(1),$(1),pwh2004,PWH2004) -Image/Build/Profile/PX4885=$(call BuildFirmware/DefaultDualSize/$(1),$(1),px4885,PX4885) +Image/Build/Profile/PX-4885=$(call BuildFirmware/DefaultDualSize/$(1),$(1),px-4885,PX-4885) Image/Build/Profile/RT5350F-OLINUXINO=$(call BuildFirmware/Default8M/$(1),$(1),rt5350f-olinuxino,RT5350F-OLINUXINO) @@ -746,7 +746,7 @@ define Image/Build/Profile/Default $(call Image/Build/Profile/MINIEMBPLUG,$(1)) $(call Image/Build/Profile/PSR-680W,$(1)) $(call Image/Build/Profile/PWH2004,$(1)) - $(call Image/Build/Profile/PX4885,$(1)) + $(call Image/Build/Profile/PX-4885,$(1)) $(call Image/Build/Profile/RT5350F-OLINUXINO,$(1)) $(call Image/Build/Profile/RT5350F-OLINUXINO-EVB,$(1)) $(call Image/Build/Profile/RTG32B1,$(1)) diff --git a/target/linux/ramips/rt305x/profiles/sevenlinks.mk b/target/linux/ramips/rt305x/profiles/sevenlinks.mk index e1a86652dd..6ddc3832d4 100644 --- a/target/linux/ramips/rt305x/profiles/sevenlinks.mk +++ b/target/linux/ramips/rt305x/profiles/sevenlinks.mk @@ -5,16 +5,14 @@ # See /LICENSE for more information. # -define Profile/PX4885 +define Profile/PX-4885 NAME:=7Links PX-4885 PACKAGES:=\ kmod-usb-core kmod-usb-dwc2 kmod-usb2 kmod-usb-ohci \ kmod-ledtrig-usbdev kmod-leds-gpio endef -define Profile/PX4885/Description +define Profile/PX-4885/Description Package set for 7Links PX-4885 wireless router. endef - -$(eval $(call Profile,PX4885)) - +$(eval $(call Profile,PX-4885))