From 5c8cc5f9aaa7300753ec7c2459fe9ec24199e670 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 17 Aug 2015 06:00:11 +0000 Subject: 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46627 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/etc/board.d/01_leds | 16 ++++++++-------- target/linux/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 +++++----- target/linux/ramips/base-files/lib/upgrade/platform.sh | 6 +++--- 5 files changed, 22 insertions(+), 20 deletions(-) (limited to 'target/linux/ramips/base-files') 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 1ae4510b4c..19e79a8875 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" - ;; - omni-plug) - set_wifi_led "miniplug:green:wlan" - set_usb_led "miniplug:green:mobile" + 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" + ;; + 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 8f6c813b20..0fab232aa9 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 712e93cdbd..e7499a8967 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 36ba3f2a8b..9b37ce6854 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 5242e46bf9..7249005594 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 | \ -- cgit v1.2.3