0044-ar71xx-Rename-unifiac-to-unifiac-lite.patch 7.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192
  1. From: Matthias Schiffer <mschiffer@universe-factory.net>
  2. Date: Fri, 13 May 2016 21:24:44 +0200
  3. Subject: ar71xx: Rename unifiac to unifiac-lite
  4. To avoid confusion with different unifiac devices, rename existing target
  5. "unifiac" to "unifiac-lite", before "unifiac-pro" is introduced.
  6. Signed-off-by: P.Wassi <p.wassi at gmx.at>
  7. Backport of LEDE c855e70491fbd5d432915c4cbeb3b80f3a117e30
  8. diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
  9. index 8c6ac9a..3d711ca 100644
  10. --- a/target/linux/ar71xx/base-files/etc/diag.sh
  11. +++ b/target/linux/ar71xx/base-files/etc/diag.sh
  12. @@ -297,7 +297,7 @@ get_status_led() {
  13. status_led="ubnt:green:dome"
  14. ;;
  15. uap-pro | \
  16. - unifiac)
  17. + unifiac-lite)
  18. status_led="ubnt:white:dome"
  19. ;;
  20. unifi-outdoor-plus)
  21. 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
  22. index e6fcec8..fa8a2c8 100644
  23. --- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
  24. +++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
  25. @@ -75,7 +75,7 @@ case "$FIRMWARE" in
  26. ath10kcal_extract "ART" 20480 2116
  27. ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16)
  28. ;;
  29. - unifiac)
  30. + unifiac-lite)
  31. ath10kcal_extract "EEPROM" 20480 2116
  32. ;;
  33. esac
  34. diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
  35. index e4a1473..0269e6d 100755
  36. --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
  37. +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
  38. @@ -366,7 +366,7 @@ tl-wa901nd-v3 |\
  39. tl-wa901nd-v4 |\
  40. tl-wr703n |\
  41. tube2h |\
  42. -unifiac |\
  43. +unifiac-lite |\
  44. wndap360 |\
  45. mynet-rext |\
  46. wp543)
  47. diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
  48. index 8670583..d3e6db9 100755
  49. --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
  50. +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
  51. @@ -881,8 +881,8 @@ ar71xx_board_detect() {
  52. *UniFi)
  53. name="unifi"
  54. ;;
  55. - *"UniFi-AC")
  56. - name="unifiac"
  57. + *"UniFi-AC-LITE")
  58. + name="unifiac-lite"
  59. ;;
  60. *"UniFi AP Pro")
  61. name="uap-pro"
  62. diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
  63. index 4c43166..a1b65b7 100755
  64. --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
  65. +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
  66. @@ -251,7 +251,7 @@ platform_check_image() {
  67. wlae-ag300n | \
  68. nbg460n_550n_550nh | \
  69. unifi | \
  70. - unifiac | \
  71. + unifiac-lite | \
  72. unifi-outdoor | \
  73. carambola2 | \
  74. weio )
  75. 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
  76. index 072cf12..31cbe30 100644
  77. --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c
  78. +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c
  79. @@ -73,7 +73,7 @@ static struct gpio_keys_button ubnt_unifiac_gpio_keys[] __initdata = {
  80. }
  81. };
  82. -static void __init ubnt_unifiac_setup(void)
  83. +static void __init ubnt_unifiac_lite_setup(void)
  84. {
  85. u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff0000);
  86. @@ -81,7 +81,7 @@ static void __init ubnt_unifiac_setup(void)
  87. ath79_init_mac(ath79_eth0_data.mac_addr,
  88. - eeprom + UNIFIAC_MAC0_OFFSET, 0);
  89. + eeprom + UNIFIAC_MAC0_OFFSET, 0);
  90. ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
  91. ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
  92. @@ -99,12 +99,12 @@ static void __init ubnt_unifiac_setup(void)
  93. ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_unifiac_leds_gpio),
  94. - ubnt_unifiac_leds_gpio);
  95. + ubnt_unifiac_leds_gpio);
  96. ath79_register_gpio_keys_polled(-1, UNIFIAC_KEYS_POLL_INTERVAL,
  97. - ARRAY_SIZE(ubnt_unifiac_gpio_keys),
  98. - ubnt_unifiac_gpio_keys);
  99. + ARRAY_SIZE(ubnt_unifiac_gpio_keys),
  100. + ubnt_unifiac_gpio_keys);
  101. }
  102. -MIPS_MACHINE(ATH79_MACH_UBNT_UNIFIAC, "UBNT-UF-AC", "Ubiquiti UniFi-AC",
  103. - ubnt_unifiac_setup);
  104. +MIPS_MACHINE(ATH79_MACH_UBNT_UNIFIAC_LITE, "UBNT-UF-AC-LITE", "Ubiquiti UniFi-AC-LITE",
  105. + ubnt_unifiac_lite_setup);
  106. diff --git a/target/linux/ar71xx/generic/profiles/ubnt.mk b/target/linux/ar71xx/generic/profiles/ubnt.mk
  107. index 94eff18..eac0240 100644
  108. --- a/target/linux/ar71xx/generic/profiles/ubnt.mk
  109. +++ b/target/linux/ar71xx/generic/profiles/ubnt.mk
  110. @@ -38,16 +38,16 @@ endef
  111. $(eval $(call Profile,UBNTUNIFI))
  112. -define Profile/UBNTUNIFIAC
  113. - NAME:=Ubiquiti UniFi AP AC
  114. +define Profile/UBNTUNIFIACLITE
  115. + NAME:=Ubiquiti UniFi AP AC LITE/LR
  116. PACKAGES:=kmod-ath10k ath10k-firmware-qca988x
  117. endef
  118. -define Profile/UBNTUNIFIAC/Description
  119. - Package set optimized for the Ubiquiti UniFi AP AC.
  120. +define Profile/UBNTUNIFIACLITE/Description
  121. + Package set optimized for the Ubiquiti UniFi AP AC LITE/LR.
  122. endef
  123. -$(eval $(call Profile,UBNTUNIFIAC))
  124. +$(eval $(call Profile,UBNTUNIFIACLITE))
  125. define Profile/UBNTUNIFIOUTDOOR
  126. NAME:=Ubiquiti UniFiAP Outdoor
  127. diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
  128. index dd59f2d..31aff78 100644
  129. --- a/target/linux/ar71xx/image/Makefile
  130. +++ b/target/linux/ar71xx/image/Makefile
  131. @@ -741,14 +741,19 @@ endef
  132. TARGET_DEVICES += oolite
  133. define Device/ubnt-unifiac
  134. - DEVICE_PROFILE := UBNT UBNTUNIFIAC
  135. + DEVICE_PROFILE := UBNT
  136. IMAGE_SIZE := 7744k
  137. 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
  138. IMAGES := sysupgrade.bin
  139. IMAGE/sysupgrade.bin = append-kernel $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
  140. +endef
  141. +
  142. +define Device/ubnt-unifiac-lite
  143. + $(Device/ubnt-unifiac)
  144. + DEVICE_PROFILE := UBNT UBNTUNIFIACLITE
  145. BOARDNAME := UBNT-UF-AC
  146. endef
  147. -TARGET_DEVICES += ubnt-unifiac
  148. +TARGET_DEVICES += ubnt-unifiac-lite
  149. rootfs_type=$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))
  150. diff --git a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
  151. index 5a7a72c..0ade403 100644
  152. --- a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
  153. +++ b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
  154. @@ -164,7 +164,7 @@
  155. + ATH79_MACH_UBNT_RS, /* Ubiquiti RouterStation */
  156. ATH79_MACH_UBNT_UAP_PRO, /* Ubiquiti UniFi AP Pro */
  157. ATH79_MACH_UBNT_UNIFI, /* Ubiquiti Unifi */
  158. -+ ATH79_MACH_UBNT_UNIFIAC, /* Ubiquiti Unifi AC */
  159. ++ ATH79_MACH_UBNT_UNIFIAC_LITE, /* Ubiquiti Unifi AC LITE/LR */
  160. ATH79_MACH_UBNT_UNIFI_OUTDOOR, /* Ubiquiti UnifiAP Outdoor */
  161. + ATH79_MACH_UBNT_UNIFI_OUTDOOR_PLUS, /* Ubiquiti UnifiAP Outdoor+ */
  162. ATH79_MACH_UBNT_XM, /* Ubiquiti Networks XM board rev 1.0 */
  163. @@ -1368,7 +1368,7 @@
  164. Ubiquiti Networks XM (rev 1.0) board.
  165. +config ATH79_MACH_UBNT_UNIFIAC
  166. -+ bool "Ubiquiti UniFi AC (LITE) support"
  167. ++ bool "Ubiquiti UniFi AC (LITE/LR) support"
  168. + select SOC_QCA956X
  169. + select ATH79_DEV_AP9X_PCI if PCI
  170. + select ATH79_DEV_ETH