From 713c81e97b5b9557bcb6e6e9dc2308d20f8dbf23 Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Mon, 17 Aug 2015 06:00:11 +0000
Subject: [PATCH] ramips: fix Omnima models, images and profiles names
Official names for supported Omnima products are (as on website):
* Omnima HPM
* Omnima MiniEMBWiFi
* Omnima MiniEMBPlug
This patch changes:
* board names
* dts filenames
* profile names
* image filenames
* LED names
for Omnima devices, for consistency.
Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
SVN-Revision: 46627
---
.../linux/ramips/base-files/etc/board.d/01_leds | 14 +++++++-------
.../ramips/base-files/etc/board.d/02_network | 2 +-
target/linux/ramips/base-files/etc/diag.sh | 8 +++++---
target/linux/ramips/base-files/lib/ramips.sh | 10 +++++-----
.../ramips/base-files/lib/upgrade/platform.sh | 6 +++---
.../ramips/dts/{OMNI-EMB-HPM.dts => HPM.dts} | 16 ++++++++--------
.../dts/{OMNI-PLUG.dts => MINIEMBPLUG.dts} | 8 ++++----
.../ramips/dts/{OMNI-EMB.dts => MINIEMBWIFI.dts} | 6 +++---
target/linux/ramips/image/Makefile | 14 +++++++-------
target/linux/ramips/rt3883/profiles/omnima.mk | 10 +++++-----
10 files changed, 48 insertions(+), 46 deletions(-)
rename target/linux/ramips/dts/{OMNI-EMB-HPM.dts => HPM.dts} (88%)
rename target/linux/ramips/dts/{OMNI-PLUG.dts => MINIEMBPLUG.dts} (91%)
rename target/linux/ramips/dts/{OMNI-EMB.dts => MINIEMBWIFI.dts} (91%)
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 1ae4510b4c2..19e79a8875e 100755
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -166,14 +166,14 @@ case $board in
set_wifi_led "m2m:blue:wifi"
ucidef_set_led_netdev "eth" "Ethernet" "m2m:green:wan" "eth0"
;;
- omni-emb-hpm)
- ucidef_set_led_default "power" "POWER" "emb:orange:power" "1"
- ucidef_set_led_netdev "eth" "ETH" "emb:green:eth" "eth0"
- set_wifi_led "emb:green:wifi"
+ hpm)
+ ucidef_set_led_default "power" "POWER" "hpm:orange:power" "1"
+ ucidef_set_led_netdev "eth" "ETH" "hpm:green:eth" "eth0"
+ set_wifi_led "hpm:green:wifi"
;;
- omni-plug)
- set_wifi_led "miniplug:green:wlan"
- set_usb_led "miniplug:green:mobile"
+ miniembplug)
+ set_wifi_led "miniembplug:green:wlan"
+ set_usb_led "miniembplug:green:mobile"
;;
px4885)
set_wifi_led "7links:orange:wifi"
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 8f6c813b207..0fab232aa94 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -243,7 +243,7 @@ ramips_setup_interfaces()
;;
d105 | \
na930 | \
- omni-emb-hpm|\
+ hpm|\
wli-tx4-ag300n)
ucidef_set_interface_lan "eth0"
;;
diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh
index 712e93cdbdf..e7499a89679 100644
--- a/target/linux/ramips/base-files/etc/diag.sh
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -119,9 +119,11 @@ get_status_led() {
nw718)
status_led="nw718:amber:cpu"
;;
- omni-emb|\
- omni-emb-hpm)
- status_led="emb:green:status"
+ miniembwifi)
+ status_led="miniembwifi:green:status"
+ ;;
+ hpm)
+ status_led="hpm:green:status"
;;
pbr-m1)
status_led="pbr-m1:green:sys"
diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index 36ba3f2a8bf..9b37ce68546 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -238,14 +238,14 @@ ramips_board_detect() {
*"Intenso Memory 2 Move")
name="m2m"
;;
- *"Omnima EMB HPM")
- name="omni-emb-hpm"
+ *"Omnima HPM")
+ name="hpm"
;;
*"Omnima MiniEMBWiFi")
- name="omni-emb"
+ name="miniembwifi"
;;
- *"Omnima MiniPlug")
- name="omni-plug"
+ *"Omnima MiniEMBPlug")
+ name="miniembplug"
;;
*"Olimex RT5350F-OLinuXino")
name="rt5350f-olinuxino"
diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 5242e46bf96..7249005594f 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -74,9 +74,9 @@ platform_check_image() {
mzk-dp150n | \
nbg-419n | \
nw718 | \
- omni-emb | \
- omni-emb-hpm | \
- omni-plug | \
+ miniembwifi | \
+ hpm | \
+ miniembplug | \
rt5350f-olinuxino | \
rt5350f-olinuxino-evb | \
psr-680w | \
diff --git a/target/linux/ramips/dts/OMNI-EMB-HPM.dts b/target/linux/ramips/dts/HPM.dts
similarity index 88%
rename from target/linux/ramips/dts/OMNI-EMB-HPM.dts
rename to target/linux/ramips/dts/HPM.dts
index 9540f4fbddd..03bf71064ff 100644
--- a/target/linux/ramips/dts/OMNI-EMB-HPM.dts
+++ b/target/linux/ramips/dts/HPM.dts
@@ -3,8 +3,8 @@
/include/ "rt3883.dtsi"
/ {
- compatible = "OMNI-EMB-HPM", "ralink,rt3883-soc";
- model = "Omnima EMB HPM";
+ compatible = "HPM", "ralink,rt3883-soc";
+ model = "Omnima HPM";
chosen {
bootargs = "console=ttyS0,115200";
@@ -99,32 +99,32 @@
compatible = "gpio-leds";
power {
- label = "emb:orange:power";
+ label = "hpm:orange:power";
gpios = <&gpio0 7 1>;
};
status {
- label = "emb:green:status";
+ label = "hpm:green:status";
gpios = <&gpio0 21 1>;
};
eth {
- label = "emb:green:eth";
+ label = "hpm:green:eth";
gpios = <&gpio0 20 1>;
};
eth2 {
- label = "emb:red:eth";
+ label = "hpm:red:eth";
gpios = <&gpio0 18 1>;
};
wifi {
- label = "emb:green:wifi";
+ label = "hpm:green:wifi";
gpios = <&gpio0 17 1>;
};
wifi2 {
- label = "emb:red:wifi";
+ label = "hpm:red:wifi";
gpios = <&gpio0 19 1>;
};
};
diff --git a/target/linux/ramips/dts/OMNI-PLUG.dts b/target/linux/ramips/dts/MINIEMBPLUG.dts
similarity index 91%
rename from target/linux/ramips/dts/OMNI-PLUG.dts
rename to target/linux/ramips/dts/MINIEMBPLUG.dts
index 25f5bca8e3e..c94c3aa6cdc 100644
--- a/target/linux/ramips/dts/OMNI-PLUG.dts
+++ b/target/linux/ramips/dts/MINIEMBPLUG.dts
@@ -3,8 +3,8 @@
/include/ "rt5350.dtsi"
/ {
- compatible = "OMNI-PLUG", "ralink,rt5350-soc";
- model = "Omnima MiniPlug";
+ compatible = "MINIEMBPLUG", "ralink,rt5350-soc";
+ model = "Omnima MiniEMBPlug";
pinctrl {
state_default: pinctrl0 {
@@ -19,12 +19,12 @@
compatible = "gpio-leds";
wlan {
- label = "miniplug:red:wlan";
+ label = "miniembplug:red:wlan";
gpios = <&gpio0 9 0>;
};
mobile {
- label = "miniplug:green:mobile";
+ label = "miniembplug:green:mobile";
gpios = <&gpio0 13 1>;
};
};
diff --git a/target/linux/ramips/dts/OMNI-EMB.dts b/target/linux/ramips/dts/MINIEMBWIFI.dts
similarity index 91%
rename from target/linux/ramips/dts/OMNI-EMB.dts
rename to target/linux/ramips/dts/MINIEMBWIFI.dts
index aa3ddc42a43..b026f0c75f3 100644
--- a/target/linux/ramips/dts/OMNI-EMB.dts
+++ b/target/linux/ramips/dts/MINIEMBWIFI.dts
@@ -3,7 +3,7 @@
/include/ "rt3050.dtsi"
/ {
- compatible = "OMNI-EMB", "ralink,rt3052-soc";
+ compatible = "MINIEMBWIFI", "ralink,rt3052-soc";
model = "Omnima MiniEMBWiFi";
pinctrl {
@@ -19,12 +19,12 @@
compatible = "gpio-leds";
status {
- label = "emb:green:status";
+ label = "miniembwifi:green:status";
gpios = <&gpio0 9 1>;
};
wlan {
- label = "emb:green:wlan";
+ label = "miniembwifi:green:wlan";
gpios = <&gpio0 14 1>;
};
};
diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
index ae89d6ccabc..f3f40eb790a 100644
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -574,9 +574,9 @@ Image/Build/Profile/NW718=$(call BuildFirmware/CustomFlashFactory/$(1),$(1),nw71
Image/Build/Profile/M2M=$(call BuildFirmware/Default8M/$(1),$(1),m2m,M2M,Linux Kernel Image)
-Image/Build/Profile/OMNI-EMB=$(call BuildFirmware/Default8M/$(1),$(1),omni-emb,OMNI-EMB)
+Image/Build/Profile/MINIEMBPLUG=$(call BuildFirmware/Default8M/$(1),$(1),miniembplug,MINIEMBPLUG)
-Image/Build/Profile/OMNI-PLUG=$(call BuildFirmware/Default8M/$(1),$(1),omni-plug,OMNI-PLUG)
+Image/Build/Profile/MINIEMBWIFI=$(call BuildFirmware/Default8M/$(1),$(1),miniembwifi,MINIEMBWIFI)
Image/Build/Profile/PSR-680W=$(call BuildFirmware/Default4M/$(1),$(1),psr-680w,PSR-680W)
@@ -742,8 +742,8 @@ define Image/Build/Profile/Default
$(call Image/Build/Profile/NBG-419N,$(1))
$(call Image/Build/Profile/NCS601W,$(1))
$(call Image/Build/Profile/NW718,$(1))
- $(call Image/Build/Profile/OMNI-EMB,$(1))
- $(call Image/Build/Profile/OMNI-PLUG,$(1))
+ $(call Image/Build/Profile/MINIEMBWIFI,$(1))
+ $(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))
@@ -815,8 +815,8 @@ Image/Build/Profile/CYSWR1100=$(call BuildFirmware/Seama/$(1),$(1),cy-swr1100,CY
Image/Build/Profile/DIR645=$(call BuildFirmware/Seama/$(1),$(1),dir-645,DIR-645,wrgn39_dlob.hans_dir645,$(ralink_default_fw_size_8M))
-omniembhpm_mtd_size=16449536
-Image/Build/Profile/OMNIEMBHPM=$(call BuildFirmware/CustomFlash/$(1),$(1),omni-emb-hpm,OMNI-EMB-HPM,$(omniembhpm_mtd_size))
+hpm_mtd_size=16449536
+Image/Build/Profile/HPM=$(call BuildFirmware/CustomFlash/$(1),$(1),hpm,HPM,$(hpm_mtd_size))
define BuildFirmware/RTN56U/squashfs
$(call BuildFirmware/Default8M/$(1),$(1),rt-n56u,RT-N56U)
@@ -838,7 +838,7 @@ ifeq ($(SUBTARGET),rt3883)
define Image/Build/Profile/Default
$(call Image/Build/Profile/CYSWR1100,$(1))
$(call Image/Build/Profile/DIR645,$(1))
- $(call Image/Build/Profile/OMNIEMBHPM,$(1))
+ $(call Image/Build/Profile/HPM,$(1))
$(call Image/Build/Profile/RTN56U,$(1))
$(call Image/Build/Profile/BR6475ND,$(1))
$(call Image/Build/Profile/TEW691GR,$(1))
diff --git a/target/linux/ramips/rt3883/profiles/omnima.mk b/target/linux/ramips/rt3883/profiles/omnima.mk
index 2f317152772..ce25999b52d 100644
--- a/target/linux/ramips/rt3883/profiles/omnima.mk
+++ b/target/linux/ramips/rt3883/profiles/omnima.mk
@@ -5,12 +5,12 @@
# See /LICENSE for more information.
#
-define Profile/OMNIEMBHPM
- NAME:=Omnima EMB-HPM board
+define Profile/HPM
+ NAME:=Omnima HPM
PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2
endef
-define Profile/OMNIEMBHPM/Description
- Package set compatible with the Omnima EMB-HPM board.
+define Profile/HPM/Description
+ Package set compatible with the Omnima HPM board.
endef
-$(eval $(call Profile,OMNIEMBHPM))
+$(eval $(call Profile,HPM))