Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

ar71xx: Rename unifiac to unifiac-lite

Browse source 
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>
This commit is contained in:
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/ar71xx/base-files/etc/board.d/02_network
View file

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

2
target/linux/ar71xx/base-files/etc/diag.sh
View file

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

2
target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
View file

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

4
target/linux/ar71xx/base-files/lib/ar71xx.sh
View file

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

2
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
View file

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

2
target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
View file

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

14
target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c
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); u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff0000);
@ -81,7 +81,7 @@ static void __init ubnt_unifiac_setup(void)
ath79_init_mac(ath79_eth0_data.mac_addr, ath79_init_mac(ath79_eth0_data.mac_addr,
eeprom + UNIFIAC_MAC0_OFFSET, 0); eeprom + UNIFIAC_MAC0_OFFSET, 0);
ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII; ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev; ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
@ -99,12 +99,12 @@ static void __init ubnt_unifiac_setup(void)
ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_unifiac_leds_gpio), ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_unifiac_leds_gpio),
ubnt_unifiac_leds_gpio); ubnt_unifiac_leds_gpio);
ath79_register_gpio_keys_polled(-1, UNIFIAC_KEYS_POLL_INTERVAL, ath79_register_gpio_keys_polled(-1, UNIFIAC_KEYS_POLL_INTERVAL,
ARRAY_SIZE(ubnt_unifiac_gpio_keys), ARRAY_SIZE(ubnt_unifiac_gpio_keys),
ubnt_unifiac_gpio_keys); ubnt_unifiac_gpio_keys);
} }
MIPS_MACHINE(ATH79_MACH_UBNT_UNIFIAC, "UBNT-UF-AC", "Ubiquiti UniFi-AC", MIPS_MACHINE(ATH79_MACH_UBNT_UNIFIAC_LITE, "UBNT-UF-AC-LITE", "Ubiquiti UniFi-AC-LITE",
ubnt_unifiac_setup); ubnt_unifiac_lite_setup);

2
target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
View file

@ -219,7 +219,7 @@ enum ath79_mach_type {
ATH79_MACH_UBNT_RS, /* Ubiquiti RouterStation */ ATH79_MACH_UBNT_RS, /* Ubiquiti RouterStation */
ATH79_MACH_UBNT_UAP_PRO, /* Ubiquiti UniFi AP Pro */ ATH79_MACH_UBNT_UAP_PRO, /* Ubiquiti UniFi AP Pro */
ATH79_MACH_UBNT_UNIFI, /* Ubiquiti Unifi */ 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, /* Ubiquiti UnifiAP Outdoor */
ATH79_MACH_UBNT_UNIFI_OUTDOOR_PLUS, /* Ubiquiti UnifiAP Outdoor+ */ ATH79_MACH_UBNT_UNIFI_OUTDOOR_PLUS, /* Ubiquiti UnifiAP Outdoor+ */
ATH79_MACH_UBNT_XM, /* Ubiquiti Networks XM board rev 1.0 */ ATH79_MACH_UBNT_XM, /* Ubiquiti Networks XM board rev 1.0 */

10
target/linux/ar71xx/generic/profiles/ubnt.mk
View file

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

21
target/linux/ar71xx/image/Makefile
View file

@ -1195,6 +1195,14 @@ define Device/ubnt-bz
IMAGE/sysupgrade.bin = append-kernel $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) IMAGE/sysupgrade.bin = append-kernel $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
endef 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 define Device/rw2458n
$(Device/ubnt-xm) $(Device/ubnt-xm)
BOARDNAME := RW2458N BOARDNAME := RW2458N
@ -1227,13 +1235,10 @@ define Device/ubnt-unifi
DEVICE_PROFILE := UBNT UBNTUNIFI DEVICE_PROFILE := UBNT UBNTUNIFI
endef endef
define Device/ubnt-unifiac define Device/ubnt-unifiac-lite
DEVICE_PROFILE := UBNT UBNTUNIFIAC $(Device/ubnt-unifiac)
IMAGE_SIZE := 7744k DEVICE_PROFILE := UBNT UBNTUNIFIACLITE
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 BOARDNAME := UBNT-UF-AC-LITE
IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin = append-kernel $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
BOARDNAME := UBNT-UF-AC
endef endef
define Device/ubnt-unifi-outdoor define Device/ubnt-unifi-outdoor
@ -1241,7 +1246,7 @@ define Device/ubnt-unifi-outdoor
BOARDNAME := UBNT-U20 BOARDNAME := UBNT-U20
DEVICE_PROFILE := UBNT UBNTUNIFIOUTDOOR DEVICE_PROFILE := UBNT UBNTUNIFIOUTDOOR
endef 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 define Device/ubnt-nano-m-xw
$(Device/ubnt-xw) $(Device/ubnt-xw)