From 56fddc2577baf194d1e9a7b37d454d12ff9fb469 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 27 Jun 2018 12:10:33 +0200 Subject: [PATCH] ath79: sync naming of Ubiquiti devices Use a Unifi AC Lite board-/image name consistent with other Ubiquiti devices. Signed-off-by: Adrian Schmutzler --- target/linux/ath79/base-files/etc/board.d/02_network | 2 +- .../base-files/etc/hotplug.d/firmware/11-ath10k-caldata | 2 +- ...nt-unifiac-lite.dts => qca9563_ubnt_unifiac-lite.dts} | 2 +- target/linux/ath79/image/generic-ubnt.mk | 9 +++++---- 4 files changed, 8 insertions(+), 7 deletions(-) rename target/linux/ath79/dts/{qca9563_ubnt-unifiac-lite.dts => qca9563_ubnt_unifiac-lite.dts} (97%) 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 e2a45b0526..e880abe5ac 100755 --- 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 20df5a220f..c3cc4d9986 100644 --- 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 993f78bb19..ff24338ca0 100644 --- 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 900167f626..aa898be2ee 100644 --- 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