ath79: sync naming of Ubiquiti devices

Use a Unifi AC Lite board-/image name consistent with other Ubiquiti
devices.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network
index e2a45b05261aed90781eaeb5c65546c85bd3bc2e..e880abe5ac33ffd88efcfbe679a8c23ff2e2d9fc 100755 (executable)
--- a/target/linux/ath79/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/base-files/etc/board.d/02_network
@@ -15,7 +15,7 @@ ath79_setup_interfaces()
        "avm,fritz300e"|\
        "tplink,tl-mr10u"|\
        "tplink,tl-wr703n"|\
-       "ubnt,ubnt-unifiac-lite"|\
+       "ubnt,unifiac-lite"|\
        "ubnt,unifi")
                ucidef_set_interface_lan "eth0"
                ;;

diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 20df5a220f5b8d606002b7484a9cf8e2be90871c..c3cc4d998673ef995af4ba4fe22b918f52556185 100644 (file)
--- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -95,7 +95,7 @@ case "$FIRMWARE" in
                ath10kcal_extract "art" 20480 2116
                ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -2)
                ;;
-       "ubnt,ubnt-unifiac-lite")
+       "ubnt,unifiac-lite")
                ath10kcal_extract "EEPROM" 20480 2116
                ;;
        esac

diff --git a/target/linux/ath79/dts/qca9563_ubnt-unifiac-lite.dts b/target/linux/ath79/dts/qca9563_ubnt_unifiac-lite.dts
similarity index 97%
rename from target/linux/ath79/dts/qca9563_ubnt-unifiac-lite.dts
rename to target/linux/ath79/dts/qca9563_ubnt_unifiac-lite.dts
index 993f78bb19e4bd2f7f2880a67cdc78540186919b..ff24338ca017d4bb9bc4a7bd9ec9273dd48ccdba 100644 (file)
--- a/target/linux/ath79/dts/qca9563_ubnt-unifiac-lite.dts
+++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac-lite.dts
@@ -7,7 +7,7 @@
 #include "qca956x.dtsi"
 
 / {
-       compatible = "ubnt,ubnt-unifiac-lite", "qca,qca9563";
+       compatible = "ubnt,unifiac-lite", "qca,qca9563";
        model = "Ubiquiti UniFi-AC-LITE/MESH/LR";
 
        chosen {

diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk
index 900167f6269cbb2c349b7faeca075df6870ee670..aa898be2ee847fcefa2597ff1e8475b0f29a96bc 100644 (file)
--- a/target/linux/ath79/image/generic-ubnt.mk
+++ b/target/linux/ath79/image/generic-ubnt.mk
@@ -80,7 +80,7 @@ define Device/ubnt_unifi
 endef
 TARGET_DEVICES += ubnt_unifi
 
-define Device/ubnt-unifiac
+define Device/ubnt_unifiac
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2
   DEVICE_PROFILE := UBNT
   IMAGE_SIZE := 7744k
@@ -89,12 +89,13 @@ define Device/ubnt-unifiac
 endef
 
 
-define Device/ubnt-unifiac-lite
-  $(Device/ubnt-unifiac)
+define Device/ubnt_unifiac-lite
+  $(Device/ubnt_unifiac)
   DEVICE_TITLE := Ubiquiti UniFi AC-Lite
+  SUPPORTED_DEVICES += ubnt-unifiac-lite
   DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x
   DEVICE_PROFILE += UBNTUNIFIACLITE
   BOARDNAME := UBNT-UF-AC-LITE
   ATH_SOC := qca9563
 endef
-TARGET_DEVICES += ubnt-unifiac-lite
+TARGET_DEVICES += ubnt_unifiac-lite