From 102073ca17b91c079cd150be0feb30796721f6da Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 17 Aug 2015 05:58:57 +0000 Subject: [PATCH] ramips: fix Argus ATP-52B board and image names The following patch: * changes board name from "argus-atp52b" to "atp-52b" * changes dts filename * fixes LED names in dts file and base-files scripts * removes manufacturer name from image filename for Argus ATP-52B device. Signed-off-by: Piotr Dymacz SVN-Revision: 46621 --- 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/dts/{ARGUS_ATP52B.dts => ATP-52B.dts} | 6 +++--- target/linux/ramips/image/Makefile | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) rename target/linux/ramips/dts/{ARGUS_ATP52B.dts => ATP-52B.dts} (91%) 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 44aebcf6e7..8f6c813b20 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -161,7 +161,7 @@ ramips_setup_interfaces() awm002-evb | \ awm003-evb | \ - argus-atp52b | \ + atp-52b | \ dir-645 | \ dir-860l-b1 | \ f5d8235-v1 | \ diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index cb3d851941..f8b7e89545 100644 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -27,8 +27,8 @@ get_status_led() { awapn2403) status_led="asiarf:green:wps" ;; - argus-atp52b) - status_led="argus-atp52b:green:run" + atp-52b) + status_led="atp-52b:green:run" ;; asl26555) status_led="asl26555:green:power" diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 9e7f4e5988..d25fa3adc6 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -62,7 +62,7 @@ ramips_board_detect() { name="c20i" ;; *"Argus ATP-52B") - name="argus-atp52b" + name="atp-52b" ;; *"AsiaRF AWM002 EVB") name="awm002-evb" diff --git a/target/linux/ramips/dts/ARGUS_ATP52B.dts b/target/linux/ramips/dts/ATP-52B.dts similarity index 91% rename from target/linux/ramips/dts/ARGUS_ATP52B.dts rename to target/linux/ramips/dts/ATP-52B.dts index f94d740f3d..c3f42bfea5 100644 --- a/target/linux/ramips/dts/ARGUS_ATP52B.dts +++ b/target/linux/ramips/dts/ATP-52B.dts @@ -3,7 +3,7 @@ /include/ "rt3050.dtsi" / { - compatible = "ARGUS_ATP52B", "ralink,rt3052-soc"; + compatible = "ATP-52B", "ralink,rt3052-soc"; model = "Argus ATP-52B"; pinctrl { @@ -49,12 +49,12 @@ compatible = "gpio-leds"; run { - label = "argus-atp52b:green:run"; + label = "atp-52b:green:run"; gpios = <&gpio0 9 1>; }; net { - label = "argus-atp52b:amber:net"; + label = "atp-52b:amber:net"; gpios = <&gpio0 13 1>; }; }; diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index c8c60b0623..78fffcd6e6 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -442,7 +442,7 @@ Image/Build/Profile/ALL5002=$(call BuildFirmware/CustomFlash/$(1),$(1),all5002,A Image/Build/Profile/ALL5003=$(call BuildFirmware/CustomFlash/$(1),$(1),all5003,ALL5003,$(allnet_all5002_mtd_size)) argus_atp52b_mtd_size=7995392 -Image/Build/Profile/ARGUS_ATP52B=$(call BuildFirmware/CustomFlash/$(1),$(1),argus_atp52b,ARGUS_ATP52B,$(argus_atp52b_mtd_size)) +Image/Build/Profile/ATP-52B=$(call BuildFirmware/CustomFlash/$(1),$(1),atp-52b,ATP-52B,$(argus_atp52b_mtd_size)) asl26555_8mb_mtd_size=7929856 asl26555_16mb_mtd_size=16252928 @@ -699,8 +699,8 @@ define Image/Build/Profile/Default $(call Image/Build/Profile/ALL0256N,$(1)) $(call Image/Build/Profile/ALL5002,$(1)) $(call Image/Build/Profile/ALL5003,$(1)) - $(call Image/Build/Profile/ARGUS_ATP52B,$(1)) $(call Image/Build/Profile/ASL26555,$(1)) + $(call Image/Build/Profile/ATP-52B,$(1)) $(call Image/Build/Profile/AWM002EVB,$(1)) $(call Image/Build/Profile/AWAPN2403,$(1)) $(call Image/Build/Profile/BC2,$(1))