From 8311960f45349102bdd094c17224f97339c85e46 Mon Sep 17 00:00:00 2001 From: blogic Date: Mon, 17 Aug 2015 06:00:49 +0000 Subject: [PATCH] ramips: fix Buffalo WMR-300 dts, board, image and profile names The following patch changes Buffalo WMR-300 dts filename, board, image and profile names from "WMR300" to "WMR-300" (for consistency). Signed-off-by: Piotr Dymacz git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46628 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- 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 +- target/linux/ramips/dts/{WMR300.dts => WMR-300.dts} | 6 +++--- target/linux/ramips/image/Makefile | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) rename target/linux/ramips/dts/{WMR300.dts => WMR-300.dts} (94%) 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 0fab232aa9..334003d1ee 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -77,7 +77,7 @@ ramips_setup_interfaces() wizard8800 | \ wl-330n | \ - wmr300) + wmr-300) ucidef_set_interface_lan "eth0.1" ;; diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index e7499a8967..c8014bf20e 100644 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -183,8 +183,8 @@ get_status_led() { whr-g300n) status_led="whr-g300n:green:router" ;; - wmr300) - status_led="buffalo:green:status" + wmr-300) + status_led="wmr-300:green:status" ;; wli-tx4-ag300n) status_led="buffalo:blue:power" diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 9b37ce6854..98bd09455d 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -320,7 +320,7 @@ ramips_board_detect() { name="w502u" ;; *"WMR-300") - name="wmr300" + name="wmr-300" ;; *"WHR-300HP2") name="whr-300hp2" diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 7249005594..e347d6f021 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -112,7 +112,7 @@ platform_check_image() { wl-341v3 | \ wli-tx4-ag300n | \ wzr-agl300nh | \ - wmr300 |\ + wmr-300 |\ wnce2001 | \ wr512-3gn |\ wr6202 |\ diff --git a/target/linux/ramips/dts/WMR300.dts b/target/linux/ramips/dts/WMR-300.dts similarity index 94% rename from target/linux/ramips/dts/WMR300.dts rename to target/linux/ramips/dts/WMR-300.dts index fbeec4c769..3dae3ae2ae 100644 --- a/target/linux/ramips/dts/WMR300.dts +++ b/target/linux/ramips/dts/WMR-300.dts @@ -70,17 +70,17 @@ compatible = "gpio-leds"; aoss1 { - label = "buffalo:red:aoss"; + label = "wmr-300:red:aoss"; gpios = <&gpio2 1 1>; }; aoss2 { - label = "buffalo:green:aoss"; + label = "wmr-300:green:aoss"; gpios = <&gpio2 2 1>; }; power { - label = "buffalo:green:status"; + label = "wmr-300:green:status"; gpios = <&gpio2 4 1>; }; }; diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index f3f40eb790..2539b5a29d 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -874,7 +874,7 @@ Image/Build/Profile/Y1=$(call BuildFirmware/Default16M/$(1),$(1),y1,Y1) Image/Build/Profile/Y1S=$(call BuildFirmware/Default16M/$(1),$(1),y1s,Y1S) Image/Build/Profile/MLW221=$(call BuildFirmware/Default16M/$(1),$(1),mlw221,MLW221) Image/Build/Profile/MLWG2=$(call BuildFirmware/Default16M/$(1),$(1),mlwg2,MLWG2) -Image/Build/Profile/WMR300=$(call BuildFirmware/Default8M/$(1),$(1),wmr-300,WMR300) +Image/Build/Profile/WMR-300=$(call BuildFirmware/Default8M/$(1),$(1),wmr-300,WMR-300) 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) @@ -908,7 +908,7 @@ define Image/Build/Profile/Default $(call Image/Build/Profile/Y1S,$(1)) $(call Image/Build/Profile/MLW221,$(1)) $(call Image/Build/Profile/MLWG2,$(1)) - $(call Image/Build/Profile/WMR300,$(1)) + $(call Image/Build/Profile/WMR-300,$(1)) $(call Image/Build/Profile/RT-N14U,$(1)) $(call Image/Build/Profile/WRTNODE,$(1)) $(call Image/Build/Profile/WT3020,$(1)) -- 2.11.0