ar71xx: Rename unifiac to unifiac-lite

To avoid confusion with different unifiac devices, rename existing target
"unifiac" to "unifiac-lite", before "unifiac-pro" is introduced.

Signed-off-by: P.Wassi <p.wassi at gmx.at>
owl
P.Wassi 2016-05-11 09:35:24 +02:00 committed by John Crispin
parent ffaaa6788a
commit c855e70491
10 changed files with 33 additions and 28 deletions

View File

@ -368,7 +368,7 @@ tl-wa901nd-v3 |\
tl-wa901nd-v4 |\
tl-wr703n |\
tube2h |\
unifiac |\
unifiac-lite |\
wndap360 |\
mynet-rext |\
wp543)

View File

@ -355,7 +355,7 @@ get_status_led() {
status_led="ubnt:green:dome"
;;
uap-pro | \
unifiac)
unifiac-lite)
status_led="ubnt:white:dome"
;;
unifi-outdoor-plus)

View File

@ -76,7 +76,7 @@ case "$FIRMWARE" in
ath10kcal_extract "ART" 20480 2116
ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16)
;;
unifiac)
unifiac-lite)
ath10kcal_extract "EEPROM" 20480 2116
;;
esac

View File

@ -949,8 +949,8 @@ ar71xx_board_detect() {
*UniFi)
name="unifi"
;;
*"UniFi-AC")
name="unifiac"
*"UniFi-AC-LITE")
name="unifiac-lite"
;;
*"UniFi AP Pro")
name="uap-pro"

View File

@ -268,7 +268,7 @@ platform_check_image() {
wlae-ag300n | \
nbg460n_550n_550nh | \
unifi | \
unifiac | \
unifiac-lite | \
unifi-outdoor | \
carambola2 | \
weio )

View File

@ -1442,7 +1442,7 @@ config ATH79_MACH_UBNT
select ATH79_DEV_USB
config ATH79_MACH_UBNT_UNIFIAC
bool "Ubiquiti UniFi AC (LITE) support"
bool "Ubiquiti UniFi AC (LITE/LR) support"
select SOC_QCA956X
select ATH79_DEV_AP9X_PCI if PCI
select ATH79_DEV_ETH

View File

@ -73,7 +73,7 @@ static struct gpio_keys_button ubnt_unifiac_gpio_keys[] __initdata = {
}
};
static void __init ubnt_unifiac_setup(void)
static void __init ubnt_unifiac_lite_setup(void)
{
u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff0000);
@ -106,5 +106,5 @@ static void __init ubnt_unifiac_setup(void)
ubnt_unifiac_gpio_keys);
}
MIPS_MACHINE(ATH79_MACH_UBNT_UNIFIAC, "UBNT-UF-AC", "Ubiquiti UniFi-AC",
ubnt_unifiac_setup);
MIPS_MACHINE(ATH79_MACH_UBNT_UNIFIAC_LITE, "UBNT-UF-AC-LITE", "Ubiquiti UniFi-AC-LITE",
ubnt_unifiac_lite_setup);

View File

@ -219,7 +219,7 @@ enum ath79_mach_type {
ATH79_MACH_UBNT_RS, /* Ubiquiti RouterStation */
ATH79_MACH_UBNT_UAP_PRO, /* Ubiquiti UniFi AP Pro */
ATH79_MACH_UBNT_UNIFI, /* Ubiquiti Unifi */
ATH79_MACH_UBNT_UNIFIAC, /* Ubiquiti Unifi AC */
ATH79_MACH_UBNT_UNIFIAC_LITE, /* Ubiquiti Unifi AC LITE/LR */
ATH79_MACH_UBNT_UNIFI_OUTDOOR, /* Ubiquiti UnifiAP Outdoor */
ATH79_MACH_UBNT_UNIFI_OUTDOOR_PLUS, /* Ubiquiti UnifiAP Outdoor+ */
ATH79_MACH_UBNT_XM, /* Ubiquiti Networks XM board rev 1.0 */

View File

@ -38,16 +38,16 @@ endef
$(eval $(call Profile,UBNTUNIFI))
define Profile/UBNTUNIFIAC
NAME:=Ubiquiti UniFi AP AC
define Profile/UBNTUNIFIACLITE
NAME:=Ubiquiti UniFi AP AC LITE/LR
PACKAGES:=kmod-ath10k ath10k-firmware-qca988x
endef
define Profile/UBNTUNIFIAC/Description
Package set optimized for the Ubiquiti UniFi AP AC.
define Profile/UBNTUNIFIACLITE/Description
Package set optimized for the Ubiquiti UniFi AP AC LITE/LR.
endef
$(eval $(call Profile,UBNTUNIFIAC))
$(eval $(call Profile,UBNTUNIFIACLITE))
define Profile/UBNTUNIFIOUTDOOR
NAME:=Ubiquiti UniFiAP Outdoor

View File

@ -1195,6 +1195,14 @@ define Device/ubnt-bz
IMAGE/sysupgrade.bin = append-kernel $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
endef
define Device/ubnt-unifiac
DEVICE_PROFILE := UBNT
IMAGE_SIZE := 7744k
MTDPARTS = spi0.0:384k(u-boot)ro,64k(u-boot-env)ro,7744k(firmware),7744k(ubnt-airos)ro,128k(bs)ro,256k(cfg)ro,64k(EEPROM)ro
IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin = append-kernel $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
endef
define Device/rw2458n
$(Device/ubnt-xm)
BOARDNAME := RW2458N
@ -1227,13 +1235,10 @@ define Device/ubnt-unifi
DEVICE_PROFILE := UBNT UBNTUNIFI
endef
define Device/ubnt-unifiac
DEVICE_PROFILE := UBNT UBNTUNIFIAC
IMAGE_SIZE := 7744k
MTDPARTS = spi0.0:384k(u-boot)ro,64k(u-boot-env)ro,7744k(firmware),7744k(ubnt-airos)ro,128k(bs)ro,256k(cfg)ro,64k(EEPROM)ro
IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin = append-kernel $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
BOARDNAME := UBNT-UF-AC
define Device/ubnt-unifiac-lite
$(Device/ubnt-unifiac)
DEVICE_PROFILE := UBNT UBNTUNIFIACLITE
BOARDNAME := UBNT-UF-AC-LITE
endef
define Device/ubnt-unifi-outdoor
@ -1241,7 +1246,7 @@ define Device/ubnt-unifi-outdoor
BOARDNAME := UBNT-U20
DEVICE_PROFILE := UBNT UBNTUNIFIOUTDOOR
endef
TARGET_DEVICES += ubnt-unifi ubnt-unifiac ubnt-unifi-outdoor
TARGET_DEVICES += ubnt-unifi ubnt-unifiac-lite ubnt-unifi-outdoor
define Device/ubnt-nano-m-xw
$(Device/ubnt-xw)