From c855e70491fbd5d432915c4cbeb3b80f3a117e30 Mon Sep 17 00:00:00 2001 From: "P.Wassi" Date: Wed, 11 May 2016 09:35:24 +0200 Subject: [PATCH] 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 --- .../ar71xx/base-files/etc/board.d/02_network | 2 +- target/linux/ar71xx/base-files/etc/diag.sh | 2 +- .../etc/hotplug.d/firmware/11-ath10k-caldata | 2 +- target/linux/ar71xx/base-files/lib/ar71xx.sh | 4 ++-- .../ar71xx/base-files/lib/upgrade/platform.sh | 2 +- .../files/arch/mips/ath79/Kconfig.openwrt | 2 +- .../files/arch/mips/ath79/mach-ubnt-unifiac.c | 14 ++++++------- .../ar71xx/files/arch/mips/ath79/machtypes.h | 2 +- target/linux/ar71xx/generic/profiles/ubnt.mk | 10 ++++----- target/linux/ar71xx/image/Makefile | 21 ++++++++++++------- 10 files changed, 33 insertions(+), 28 deletions(-) diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network index 67adf334aa57..4cf7434b06a9 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -368,7 +368,7 @@ tl-wa901nd-v3 |\ tl-wa901nd-v4 |\ tl-wr703n |\ tube2h |\ -unifiac |\ +unifiac-lite |\ wndap360 |\ mynet-rext |\ wp543) diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index f95a72d295db..71f5ebc6433c 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -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) diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 8fc3ab3cd4b9..3490129e25db 100644 --- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -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 diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index d71b8ba838e6..d05ef54954e1 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -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" diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 9f8a14b2bcfb..18d923767eb9 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -268,7 +268,7 @@ platform_check_image() { wlae-ag300n | \ nbg460n_550n_550nh | \ unifi | \ - unifiac | \ + unifiac-lite | \ unifi-outdoor | \ carambola2 | \ weio ) diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt index 0fb2df26d43c..622d9a72a37a 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt @@ -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 diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c index 072cf12a31a0..31cbe30d3ff9 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c @@ -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); @@ -81,7 +81,7 @@ static void __init ubnt_unifiac_setup(void) 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.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), - ubnt_unifiac_leds_gpio); + ubnt_unifiac_leds_gpio); ath79_register_gpio_keys_polled(-1, UNIFIAC_KEYS_POLL_INTERVAL, - ARRAY_SIZE(ubnt_unifiac_gpio_keys), - ubnt_unifiac_gpio_keys); + ARRAY_SIZE(ubnt_unifiac_gpio_keys), + 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); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h index 48792552316c..d83045cf295b 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -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 */ diff --git a/target/linux/ar71xx/generic/profiles/ubnt.mk b/target/linux/ar71xx/generic/profiles/ubnt.mk index 94eff1831826..eac02406bbbf 100644 --- a/target/linux/ar71xx/generic/profiles/ubnt.mk +++ b/target/linux/ar71xx/generic/profiles/ubnt.mk @@ -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 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index bc8a4a8ec72b..dba26672ab47 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -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) -- 2.30.2