aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Roederer <devel-sven@geroedel.de>2019-03-07 00:09:15 +0100
committerChristian Lamparter <chunkeey@gmail.com>2019-03-18 20:55:24 +0100
commitf1396ac753cc2be0957daf99696198363560591c (patch)
tree2478c56b3efac29c79983ff6f610cf5cfd2f6a39
parentc3a17ee4b3709616923ab8ed008d995e11794a7d (diff)
downloadupstream-f1396ac753cc2be0957daf99696198363560591c.tar.gz
upstream-f1396ac753cc2be0957daf99696198363560591c.tar.bz2
upstream-f1396ac753cc2be0957daf99696198363560591c.zip
ath79: align naming of Ubiquiti Nanostation M
Support for the Nanostation M (XW) was added in 40530c8eb with board name "nanostation-m-xw". The current image for the "Nanostation M" uses "nano-m" as the board name. This commit renames it to the full product name as it's used by all other boards. The legacy boardname of the ar71xx target is added via SUPPORTED_DEVICES to ease switching to ath79 target. Signed-off-by: Sven Roederer <devel-sven@geroedel.de> [touch-ups on the commit message, removed subject remains] Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-rwxr-xr-xtarget/linux/ath79/base-files/etc/board.d/01_leds2
-rw-r--r--target/linux/ath79/dts/ar7241_ubnt_nanostation-m.dts (renamed from target/linux/ath79/dts/ar7241_ubnt_nano-m.dts)2
-rw-r--r--target/linux/ath79/image/generic-ubnt.mk7
3 files changed, 6 insertions, 5 deletions
diff --git a/target/linux/ath79/base-files/etc/board.d/01_leds b/target/linux/ath79/base-files/etc/board.d/01_leds
index 0b0dda3bcf..db5a6a4578 100755
--- a/target/linux/ath79/base-files/etc/board.d/01_leds
+++ b/target/linux/ath79/base-files/etc/board.d/01_leds
@@ -155,7 +155,7 @@ tplink,tl-wr841-v11)
;;
ubnt,bullet-m|\
ubnt,bullet-m-xw|\
-ubnt,nano-m|\
+ubnt,nanostation-m|\
ubnt,nanostation-m-xw|\
ubnt,rocket-m)
ucidef_set_rssimon "wlan0" "200000" "1"
diff --git a/target/linux/ath79/dts/ar7241_ubnt_nano-m.dts b/target/linux/ath79/dts/ar7241_ubnt_nanostation-m.dts
index ebdc4306e5..eebe65e53f 100644
--- a/target/linux/ath79/dts/ar7241_ubnt_nano-m.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_nanostation-m.dts
@@ -4,6 +4,6 @@
#include "ar7241_ubnt_xm_outdoor.dtsi"
/ {
- compatible = "ubnt,nano-m", "ubnt,xm", "qca,ar7241";
+ compatible = "ubnt,nanostation-m", "ubnt,xm", "qca,ar7241";
model = "Ubiquiti Nanostation M";
};
diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk
index 89b9f6746d..b7e867d8bf 100644
--- a/target/linux/ath79/image/generic-ubnt.mk
+++ b/target/linux/ath79/image/generic-ubnt.mk
@@ -106,16 +106,17 @@ define Device/ubnt_rocket-m
endef
TARGET_DEVICES += ubnt_rocket-m
-define Device/ubnt_nano-m
+define Device/ubnt_nanostation-m
$(Device/ubnt-xm)
- DEVICE_TITLE := Ubiquiti Nano-M
+ DEVICE_TITLE := Ubiquiti Nanostation M
SUPPORTED_DEVICES += nano-m
endef
-TARGET_DEVICES += ubnt_nano-m
+TARGET_DEVICES += ubnt_nanostation-m
define Device/ubnt_nanostation-m-xw
$(Device/ubnt-xw)
DEVICE_TITLE := Ubiquiti Nanostation M (XW)
+ SUPPORTED_DEVICES += nano-m-xw
endef
TARGET_DEVICES += ubnt_nanostation-m-xw