ar71xx: merge profiles into image building code

- Remove old style device profiles and convert them to device definitions
  within the image building code

- Fix the legacy build macros for the changed eval depth in the legacy
  image build wrapper

Signed-off-by: John Crispin <john@phrozen.org>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

6 files changed, 959 insertions, 67 deletions

diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk
index 996bc5b1ac..095c542e02 100644
--- a/target/linux/ar71xx/image/generic.mk
+++ b/target/linux/ar71xx/image/generic.mk
@@ -1,4 +1,6 @@
 define Device/bsb
+  DEVICE_TITLE := Smart Electronics Black Swift board
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2
   BOARDNAME = BSB
   IMAGE_SIZE = 16000k
   CONSOLE = ttyATH0,115200
@@ -7,6 +9,8 @@ endef
 TARGET_DEVICES += bsb
 
 define Device/carambola2
+  DEVICE_TITLE := Carambola2 board from 8Devices
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2
   BOARDNAME = CARAMBOLA2
   IMAGE_SIZE = 16000k
   CONSOLE = ttyATH0,115200
@@ -15,6 +19,7 @@ endef
 TARGET_DEVICES += carambola2
 
 define Device/cf-e316n-v2
+  DEVICE_TITLE := COMFAST CF-E316N v2
   BOARDNAME = CF-E316N-V2
   IMAGE_SIZE = 16192k
   CONSOLE = ttyS0,115200
@@ -23,6 +28,8 @@ endef
 TARGET_DEVICES += cf-e316n-v2
 
 define Device/weio
+  DEVICE_TITLE := WeIO
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2
   BOARDNAME = WEIO
   IMAGE_SIZE = 16000k
   CONSOLE = ttyATH0,115200
@@ -31,6 +38,8 @@ endef
 TARGET_DEVICES += weio
 
 define Device/gl-ar150
+  DEVICE_TITLE := GL AR150
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2
   BOARDNAME = GL-AR150
   IMAGE_SIZE = 16000k
   CONSOLE = ttyATH0,115200
@@ -39,6 +48,8 @@ endef
 TARGET_DEVICES += gl-ar150
 
 define Device/gl-ar300
+  DEVICE_TITLE := GL AR300
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2
   BOARDNAME = GL-AR300
   IMAGE_SIZE = 16000k
   CONSOLE = ttyS0,115200
@@ -47,6 +58,8 @@ endef
 TARGET_DEVICES += gl-ar300
 
 define Device/gl-domino
+  DEVICE_TITLE := GL Domino Pi
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2
   BOARDNAME = DOMINO
   IMAGE_SIZE = 16000k
   CONSOLE = ttyATH0,115200
@@ -55,6 +68,8 @@ endef
 TARGET_DEVICES += gl-domino
 
 define Device/wndr3700
+  DEVICE_TITLE := NETGEAR WNDR3700
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev kmod-leds-wndr3700-usb
   BOARDNAME = WNDR3700
   NETGEAR_KERNEL_MAGIC = 0x33373030
   NETGEAR_BOARD_ID = WNDR3700
@@ -70,6 +85,7 @@ endef
 
 define Device/wndr3700v2
 $(Device/wndr3700)
+  DEVICE_TITLE := NETGEAR WNDR3700 v2
   NETGEAR_BOARD_ID = WNDR3700v2
   NETGEAR_KERNEL_MAGIC = 0x33373031
   NETGEAR_HW_ID = 29763654+16+64
@@ -80,28 +96,34 @@ endef
 
 define Device/wndr3800
 $(Device/wndr3700v2)
+  DEVICE_TITLE := NETGEAR WNDR3800
   NETGEAR_BOARD_ID = WNDR3800
   NETGEAR_HW_ID = 29763654+16+128
 endef
 
 define Device/wndr3800ch
 $(Device/wndr3800)
+  DEVICE_TITLE := NETGEAR WNDR3800 (Ch)
   NETGEAR_BOARD_ID = WNDR3800CH
 endef
 
 define Device/wndrmac
 $(Device/wndr3700v2)
+  DEVICE_TITLE := NETGEAR WNDRMAC
   NETGEAR_BOARD_ID = WNDRMAC
 endef
 
 define Device/wndrmacv2
 $(Device/wndr3800)
+  DEVICE_TITLE := NETGEAR WNDRMAC v2
   NETGEAR_BOARD_ID = WNDRMACv2
 endef
 
 TARGET_DEVICES += wndr3700 wndr3700v2 wndr3800 wndr3800ch wndrmac wndrmacv2
 
 define Device/cap324
+  DEVICE_TITLE := PowerCloud CAP324 Cloud AP
+  DEVICE_PACKAGES := uboot-envtools
   BOARDNAME := CAP324
   DEVICE_PROFILE := CAP324
   IMAGE_SIZE = 15296k
@@ -111,6 +133,8 @@ endef
 TARGET_DEVICES += cap324
 
 define Device/cap324-nocloud
+  DEVICE_TITLE := PowerCloud CAP324 Cloud AP
+  DEVICE_PACKAGES := uboot-envtools
   BOARDNAME := CAP324
   DEVICE_PROFILE := CAP324
   IMAGE_SIZE = 16000k
@@ -120,6 +144,8 @@ endef
 TARGET_DEVICES += cap324-nocloud
 
 define Device/cr3000
+  DEVICE_TITLE := PowerCloud CR3000 Cloud Router
+  DEVICE_PACKAGES := uboot-envtools
   BOARDNAME := CR3000
   DEVICE_PROFILE := CR3000
   IMAGE_SIZE = 7104k
@@ -129,6 +155,8 @@ endef
 TARGET_DEVICES += cr3000
 
 define Device/cr3000-nocloud
+  DEVICE_TITLE := PowerCloud CR3000 (No-Cloud)
+  DEVICE_PACKAGES := uboot-envtools
   BOARDNAME := CR3000
   DEVICE_PROFILE := CR3000
   IMAGE_SIZE = 7808k
@@ -138,6 +166,8 @@ endef
 TARGET_DEVICES += cr3000-nocloud
 
 define Device/cr5000
+  DEVICE_TITLE := PowerCloud CR5000 Cloud Router
+  DEVICE_PACKAGES := uboot-envtools kmod-usb2 kmod-usb-ohci kmod-ledtrig-usbdev kmod-usb-core
   BOARDNAME := CR5000
   DEVICE_PROFILE := CR5000
   IMAGE_SIZE = 7104k
@@ -147,6 +177,8 @@ endef
 TARGET_DEVICES += cr5000
 
 define Device/cr5000-nocloud
+  DEVICE_TITLE := PowerCloud CR5000 (No-Cloud)
+  DEVICE_PACKAGES := uboot-envtools kmod-usb2 kmod-usb-ohci kmod-ledtrig-usbdev kmod-usb-core
   BOARDNAME := CR5000
   DEVICE_PROFILE := CR5000
   IMAGE_SIZE = 7808k
@@ -157,6 +189,8 @@ TARGET_DEVICES += cr5000-nocloud
 
 define Device/antminer-s1
     $(Device/tplink-8mlzma)
+    DEVICE_TITLE := Antminer-S1
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-crypto-manager kmod-i2c-gpio-custom kmod-usb-hid
     BOARDNAME := ANTMINER-S1
     DEVICE_PROFILE := ANTMINERS1
     TPLINK_HWID := 0x04440101
@@ -165,6 +199,8 @@ endef
 
 define Device/antminer-s3
     $(Device/tplink-8mlzma)
+    DEVICE_TITLE := Antminer-S3
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-crypto-manager kmod-i2c-gpio-custom kmod-usb-hid
     BOARDNAME := ANTMINER-S3
     DEVICE_PROFILE := ANTMINERS3
     TPLINK_HWID := 0x04440301
@@ -173,6 +209,8 @@ endef
 
 define Device/antrouter-r1
     $(Device/tplink-8mlzma)
+    DEVICE_TITLE := Antrouter-R1
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2
     BOARDNAME := ANTROUTER-R1
     DEVICE_PROFILE := ANTROUTERR1
     TPLINK_HWID := 0x44440101
@@ -181,6 +219,8 @@ endef
 
 define Device/el-m150
     $(Device/tplink-8mlzma)
+    DEVICE_TITLE := EasyLink EL-M150
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2
     BOARDNAME := EL-M150
     DEVICE_PROFILE := ELM150
     TPLINK_HWID := 0x01500101
@@ -189,6 +229,8 @@ endef
 
 define Device/el-mini
     $(Device/tplink-8mlzma)
+    DEVICE_TITLE := EasyLink EL-MINI
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2
     BOARDNAME := EL-MINI
     DEVICE_PROFILE := ELMINI
     TPLINK_HWID := 0x01530001
@@ -198,6 +240,8 @@ TARGET_DEVICES += antminer-s1 antminer-s3 antrouter-r1 el-m150 el-mini
 
 define Device/gl-inet-6408A-v1
     $(Device/tplink-8mlzma)
+    DEVICE_TITLE := GL.iNet 6408
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2
     BOARDNAME := GL-INET
     DEVICE_PROFILE := GLINET
     TPLINK_HWID := 0x08000001
@@ -206,6 +250,8 @@ endef
 
 define Device/gl-inet-6416A-v1
     $(Device/tplink-16mlzma)
+    DEVICE_TITLE := GL.iNet 6416
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2
     BOARDNAME := GL-INET
     DEVICE_PROFILE := GLINET
     TPLINK_HWID := 0x08000001
@@ -215,6 +261,7 @@ TARGET_DEVICES += gl-inet-6408A-v1 gl-inet-6416A-v1
 
 define Device/rnx-n360rt
     $(Device/tplink-4m)
+    DEVICE_TITLE := Rosewill RNX-N360RT
     BOARDNAME := TL-WR941ND
     DEVICE_PROFILE := RNXN360RT
     TPLINK_HWID := 0x09410002
@@ -224,6 +271,8 @@ TARGET_DEVICES += rnx-n360rt
 
 define Device/mc-mac1200r
     $(Device/tplink-8mlzma)
+    DEVICE_TITLE := MERCURY MAC1200R
+    DEVICE_PACKAGES := kmod-ath10k
     BOARDNAME := MC-MAC1200R
     DEVICE_PROFILE := MAC1200R
     TPLINK_HWID := 0x12000001
@@ -232,6 +281,8 @@ TARGET_DEVICES += mc-mac1200r
 
 define Device/minibox-v1
     $(Device/tplink-16mlzma)
+    DEVICE_TITLE := Gainstrong MiniBox V1.0
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2  kmod-ledtrig-usbdev
     BOARDNAME := MINIBOX-V1
     DEVICE_PROFILE := MINIBOXV1
     TPLINK_HWID := 0x3C000201
@@ -241,6 +292,8 @@ TARGET_DEVICES += minibox-v1
 
 define Device/omy-g1
     $(Device/tplink-16mlzma)
+    DEVICE_TITLE := OMYlink OMY-G1
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2
     BOARDNAME := OMY-G1
     DEVICE_PROFILE := OMYG1
     TPLINK_HWID := 0x06660101
@@ -248,6 +301,7 @@ endef
 
 define Device/omy-x1
     $(Device/tplink-8mlzma)
+    DEVICE_TITLE := OMYlink OMY-X1
     BOARDNAME := OMY-X1
     DEVICE_PROFILE := OMYX1
     TPLINK_HWID := 0x06660201
@@ -256,6 +310,8 @@ TARGET_DEVICES += omy-g1 omy-x1
 
 define Device/onion-omega
     $(Device/tplink-16mlzma)
+    DEVICE_TITLE := Onion Omega
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-i2c-core kmod-i2c-gpio-custom kmod-spi-bitbang kmod-spi-dev kmod-spi-gpio kmod-spi-gpio-custom kmod-usb-serial
     BOARDNAME := ONION-OMEGA
     DEVICE_PROFILE := OMEGA
     TPLINK_HWID := 0x04700001
@@ -265,6 +321,7 @@ TARGET_DEVICES += onion-omega
 
 define Device/smart-300
     $(Device/tplink-8mlzma)
+    DEVICE_TITLE := NC-LINK SMART-300
     BOARDNAME := SMART-300
     DEVICE_PROFILE := SMART-300
     TPLINK_HWID := 0x93410001
@@ -273,6 +330,8 @@ TARGET_DEVICES += smart-300
 
 define Device/som9331
     $(Device/tplink-8mlzma)
+    DEVICE_TITLE := OpenEmbed SOM9331
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-i2c-core kmod-i2c-gpio-custom kmod-spi-bitbang kmod-spi-dev kmod-spi-gpio kmod-spi-gpio-custom kmod-usb-serial
     BOARDNAME := SOM9331
     DEVICE_PROFILE := SOM9331
     TPLINK_HWID := 0x04800054
@@ -282,6 +341,8 @@ TARGET_DEVICES += som9331
 
 define Device/tellstick-znet-lite
     $(Device/tplink-16mlzma)
+    DEVICE_TITLE := TellStick ZNet Lite
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-acm kmod-usb-serial kmod-usb-serial-pl2303
     BOARDNAME := TELLSTICK-ZNET-LITE
     DEVICE_PROFILE := TELLSTICKZNETLITE
     TPLINK_HWID := 0x00726001
@@ -291,6 +352,8 @@ TARGET_DEVICES += tellstick-znet-lite
 
 define Device/oolite
     $(Device/tplink-16mlzma)
+    DEVICE_TITLE := Gainstrong OOLITE
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
     BOARDNAME := GS-OOLITE
     DEVICE_PROFILE := OOLITE
     TPLINK_HWID := 0x3C000101
@@ -300,45 +363,49 @@ TARGET_DEVICES += oolite
 
 
 define Device/NBG6616
-	BOARDNAME = NBG6616
-	KERNEL_SIZE = 2048k
-	IMAGE_SIZE = 15323k
-	MTDPARTS = spi0.0:192k(u-boot)ro,64k(env)ro,64k(RFdata)ro,384k(zyxel_rfsd),384k(romd),64k(header),2048k(kernel),13184k(rootfs),15232k@0x120000(firmware)
-	CMDLINE += mem=128M
-	IMAGES := sysupgrade.bin
-	KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma | jffs2 boot/vmlinux.lzma.uImage
-	IMAGE/sysupgrade.bin = append-kernel $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
-	# We cannot currently build a factory image. It is the sysupgrade image
-	# prefixed with a header (which is actually written into the MTD device).
-	# The header is 2kiB and is filled with 0xff. The format seems to be:
-	#   2 bytes:  0x0000
-	#   2 bytes:  checksum of the data partition (big endian)
-	#   4 bytes:  length of the contained image file (big endian)
-	#  32 bytes:  Firmware Version string (NUL terminated, 0xff padded)
-	#   2 bytes:  0x0000
-	#   2 bytes:  checksum over the header partition (big endian)
-	#  32 bytes:  Model (e.g. "NBG6616", NUL termiated, 0xff padded)
-	#      rest: 0xff padding
-	#
-	# The checksums are calculated by adding up all bytes and if a 16bit
-	# overflow occurs, one is added and the sum is masked to 16 bit:
-	#   csum = csum + databyte; if (csum > 0xffff) { csum += 1; csum &= 0xffff };
-	# Should the file have an odd number of bytes then the byte len-0x800 is
-	# used additionally.
-	# The checksum for the header is calcualted over the first 2048 bytes with
-	# the firmware checksum as the placeholder during calculation.
-	#
-	# The header is padded with 0xff to the erase block size of the device.
+  DEVICE_TITLE := ZyXEL NBG6616
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-usb-storage kmod-rtc-pcf8563 kmod-ath10k
+  BOARDNAME = NBG6616
+  KERNEL_SIZE = 2048k
+  IMAGE_SIZE = 15323k
+  MTDPARTS = spi0.0:192k(u-boot)ro,64k(env)ro,64k(RFdata)ro,384k(zyxel_rfsd),384k(romd),64k(header),2048k(kernel),13184k(rootfs),15232k@0x120000(firmware)
+  CMDLINE += mem=128M
+  IMAGES := sysupgrade.bin
+  KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma | jffs2 boot/vmlinux.lzma.uImage
+  IMAGE/sysupgrade.bin = append-kernel $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
+  # We cannot currently build a factory image. It is the sysupgrade image
+  # prefixed with a header (which is actually written into the MTD device).
+  # The header is 2kiB and is filled with 0xff. The format seems to be:
+  #   2 bytes:  0x0000
+  #   2 bytes:  checksum of the data partition (big endian)
+  #   4 bytes:  length of the contained image file (big endian)
+  #  32 bytes:  Firmware Version string (NUL terminated, 0xff padded)
+  #   2 bytes:  0x0000
+  #   2 bytes:  checksum over the header partition (big endian)
+  #  32 bytes:  Model (e.g. "NBG6616", NUL termiated, 0xff padded)
+  #      rest: 0xff padding
+  #
+  # The checksums are calculated by adding up all bytes and if a 16bit
+  # overflow occurs, one is added and the sum is masked to 16 bit:
+  #   csum = csum + databyte; if (csum > 0xffff) { csum += 1; csum &= 0xffff };
+  # Should the file have an odd number of bytes then the byte len-0x800 is
+  # used additionally.
+  # The checksum for the header is calcualted over the first 2048 bytes with
+  # the firmware checksum as the placeholder during calculation.
+  #
+  # The header is padded with 0xff to the erase block size of the device.
 endef
 
 TARGET_DEVICES += NBG6616
 
 define Device/c-55
-	BOARDNAME = C-55
-	KERNEL_SIZE = 2048k
-	IMAGE_SIZE = 15872k
-	MTDPARTS = spi0.0:256k(u-boot)ro,128k(u-boot-env)ro,2048k(kernel),13824k(rootfs),13824k(opt)ro,2624k(failsafe)ro,64k(art)ro,15872k@0x60000(firmware)
-	IMAGE/sysupgrade.bin = append-kernel $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
+  DEVICE_TITLE := AirTight Networks C-55
+  DEVICE_PACKAGES := kmod-ath9k
+  BOARDNAME = C-55
+  KERNEL_SIZE = 2048k
+  IMAGE_SIZE = 15872k
+  MTDPARTS = spi0.0:256k(u-boot)ro,128k(u-boot-env)ro,2048k(kernel),13824k(rootfs),13824k(opt)ro,2624k(failsafe)ro,64k(art)ro,15872k@0x60000(firmware)
+  IMAGE/sysupgrade.bin = append-kernel $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
 endef
 
 TARGET_DEVICES += c-55
diff --git a/target/linux/ar71xx/image/legacy-devices.mk b/target/linux/ar71xx/image/legacy-devices.mk
new file mode 100644
index 0000000000..0e51fef2fc
--- /dev/null
+++ b/target/linux/ar71xx/image/legacy-devices.mk
@@ -0,0 +1,675 @@
+define LegacyDevice/ALFAAP120C
+	DEVICE_TITLE := ALFA Network AP120C board
+	DEVICE_PACKAGES := uboot-envtools
+endef
+LEGACY_DEVICES += ALFAAP120C
+
+define LegacyDevice/ALFAAP96
+	DEVICE_TITLE := ALFA Network AP96 board
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-rtc-pcf2123
+endef
+LEGACY_DEVICES += ALFAAP96
+
+define LegacyDevice/HORNETUB
+	DEVICE_TITLE := ALFA Network Hornet-UB board (8MB flash, 32MB ram)
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+LEGACY_DEVICES += HORNETUB
+
+define LegacyDevice/HORNETUBx2
+	DEVICE_TITLE := ALFA Network Hornet-UB-x2 board (16MB flash, 64MB ram)
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+LEGACY_DEVICES += HORNETUBx2
+
+define LegacyDevice/ALFANX
+	DEVICE_TITLE := ALFA Network N2/N5 board
+endef
+LEGACY_DEVICES += ALFANX
+
+define LegacyDevice/TUBE2H
+	DEVICE_TITLE := ALFA Network Tube2H board
+endef
+LEGACY_DEVICES += TUBE2H
+
+define LegacyDevice/ALL0305
+	DEVICE_TITLE := Allnet ALL0305
+	DEVICE_PACKAGES := fconfig kmod-ath5k -kmod-ath9k
+endef
+LEGACY_DEVICES += ALL0305
+
+define LegacyDevice/ALL0258N
+	DEVICE_TITLE := Allnet ALL0258N
+	DEVICE_PACKAGES := uboot-envtools rssileds
+endef
+LEGACY_DEVICES += ALL0258N
+
+define LegacyDevice/ALL0315N
+	DEVICE_TITLE := Allnet ALL0315N
+	DEVICE_PACKAGES := uboot-envtools rssileds
+endef
+LEGACY_DEVICES += ALL0315N
+
+define LegacyDevice/Yun
+	DEVICE_TITLE := Arduino Yun based on Atheros AR9331
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2
+endef
+LEGACY_DEVICES += Yun
+
+define LegacyDevice/AP113
+	DEVICE_TITLE := Atheros AP113 reference board
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2
+endef
+LEGACY_DEVICES += AP113
+
+define LegacyDevice/AP121
+	DEVICE_TITLE := Atheros AP121 reference board
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2
+endef
+LEGACY_DEVICES += AP121
+
+define LegacyDevice/AP121MINI
+	DEVICE_TITLE := Atheros AP121-MINI reference board
+endef
+LEGACY_DEVICES += AP121MINI
+
+define LegacyDevice/AP132
+	DEVICE_TITLE := Atheros AP132 reference board
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage
+endef
+LEGACY_DEVICES += AP132
+
+define LegacyDevice/AP135
+	DEVICE_TITLE := Atheros AP135 reference board
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage
+endef
+LEGACY_DEVICES += AP135
+
+define LegacyDevice/AP136
+	DEVICE_TITLE := Atheros AP136 reference board
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage
+endef
+LEGACY_DEVICES += AP136
+
+define LegacyDevice/AP143
+	DEVICE_TITLE := Qualcomm Atheros AP143 reference board
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage
+endef
+LEGACY_DEVICES += AP143
+
+define LegacyDevice/AP147
+	DEVICE_TITLE := Qualcomm Atheros AP147 reference board
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage
+endef
+LEGACY_DEVICES += AP147
+
+define LegacyDevice/AP152
+	DEVICE_TITLE := Qualcomm Atheros AP152 reference board
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage
+endef
+LEGACY_DEVICES += AP152
+
+define LegacyDevice/AP81
+	DEVICE_TITLE := Atheros AP81 reference board
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2
+endef
+LEGACY_DEVICES += AP81
+
+define LegacyDevice/AP83
+	DEVICE_TITLE := Atheros AP83 reference board
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 \
+		  vsc7385-ucode-ap83 vsc7395-ucode-ap83
+endef
+LEGACY_DEVICES += AP83
+
+define LegacyDevice/AP96
+	DEVICE_TITLE := Atheros AP96 reference board
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2
+endef
+LEGACY_DEVICES += AP96
+
+define LegacyDevice/DB120
+	DEVICE_TITLE := Atheros DB120 reference board
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage
+endef
+LEGACY_DEVICES += DB120
+
+define LegacyDevice/PB42
+	DEVICE_TITLE := Atheros PB42 reference board
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2
+endef
+LEGACY_DEVICES += PB42
+
+define LegacyDevice/PB44
+	DEVICE_TITLE := Atheros PB44 reference board
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
+		  vsc7385-ucode-pb44 vsc7395-ucode-pb44
+endef
+LEGACY_DEVICES += PB44
+
+define LegacyDevice/PB92
+	DEVICE_TITLE := Atheros PB92 reference board
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2
+endef
+LEGACY_DEVICES += PB92
+
+define LegacyDevice/A02RBW300N
+	DEVICE_TITLE := Atlantis-Land A02-RB-W300N
+endef
+LEGACY_DEVICES += A02RBW300N
+
+define LegacyDevice/F9K1115V2
+	DEVICE_TITLE := Belkin AC1750DB (F9K1115V2)
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb3 kmod-ledtrig-usbdev \
+		kmod-ath10k
+endef
+LEGACY_DEVICES += F9K1115V2
+
+define LegacyDevice/BXU2000N2
+	DEVICE_TITLE := BHU BXU2000n-2
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-storage
+endef
+LEGACY_DEVICES += BXU2000N2
+
+define LegacyDevice/WZRHPG300NH
+	DEVICE_TITLE := Buffalo WZR-HP-G300NH
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+LEGACY_DEVICES += WZRHPG300NH
+
+define LegacyDevice/WZRHPG300NH2
+	DEVICE_TITLE := Buffalo WZR-HP-G300NH2
+	DEVICE_PACKAGES := kmod-ath9k wpad-mini kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+LEGACY_DEVICES += WZRHPG300NH2
+
+define LegacyDevice/WZRHPAG300H
+	DEVICE_TITLE := Buffalo WZR-HP-AG300H
+	DEVICE_PACKAGES := kmod-usb-ohci kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+LEGACY_DEVICES += WZRHPAG300H
+
+define LegacyDevice/WZRHPG450H
+	DEVICE_TITLE := Buffalo WZR-HP-G450H
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+LEGACY_DEVICES += WZRHPG450H
+
+define LegacyDevice/WZR450HP2
+	DEVICE_TITLE := Buffalo WZR-450HP2
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+LEGACY_DEVICES += WZR450HP2
+
+define LegacyDevice/WZR600DHP
+	DEVICE_TITLE := Buffalo WZR-600DHP
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+LEGACY_DEVICES += WZR600DHP
+
+define LegacyDevice/WHRG301N
+	DEVICE_TITLE := Buffalo WHR-G301N
+endef
+LEGACY_DEVICES += WHRG301N
+
+define LegacyDevice/WHRHPG300N
+	DEVICE_TITLE := Buffalo WHR-HP-G300N
+endef
+LEGACY_DEVICES += WHRHPG300N
+
+define LegacyDevice/WHRHPGN
+	DEVICE_TITLE := Buffalo WHR-HP-GN
+endef
+LEGACY_DEVICES += WHRHPGN
+
+define LegacyDevice/WLAEAG300N
+	DEVICE_TITLE := Buffalo WLAE-AG300N
+	DEVICE_PACKAGES := kmod-ledtrig-netdev
+endef
+LEGACY_DEVICES += WLAEAG300N
+
+define LegacyDevice/WP543
+	DEVICE_TITLE := Compex WP543/WPJ543
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2
+endef
+LEGACY_DEVICES += WP543
+
+define LegacyDevice/WPE72
+	DEVICE_TITLE := Compex WPE72/WPE72NX
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2
+endef
+LEGACY_DEVICES += WPE72
+
+define LegacyDevice/WPJ342
+	DEVICE_TITLE := Compex WPJ342
+endef
+LEGACY_DEVICES += WPJ342
+
+define LegacyDevice/WPJ344
+	DEVICE_TITLE := Compex WPJ344
+endef
+LEGACY_DEVICES += WPJ344
+
+define LegacyDevice/WPJ531
+	DEVICE_TITLE := Compex WPJ531
+endef
+LEGACY_DEVICES += WPJ531
+
+define LegacyDevice/WPJ558
+	DEVICE_TITLE := Compex WPJ558
+endef
+LEGACY_DEVICES += WPJ558
+
+define LegacyDevice/dLAN_Hotspot
+	DEVICE_TITLE := devolo dLAN Hotspot
+	DEVICE_PACKAGES := open-plc-utils open-plc-utils-chkpib open-plc-utils-getpib open-plc-utils-modpib \
+		open-plc-utils-setpib open-plc-utils-hpavkey open-plc-utils-plchost \
+		open-plc-utils-plctool open-plc-utils-pibdump open-plc-utils-plcstat \
+		ebtables hostapd-utils wifitoggle wpad
+endef
+LEGACY_DEVICES += dLAN_Hotspot
+
+define LegacyDevice/dLAN_pro_500_wp
+	DEVICE_TITLE := devolo dLAN pro 500 Wireless+
+	DEVICE_PACKAGES := open-plc-utils open-plc-utils-chkpib open-plc-utils-getpib open-plc-utils-modpib \
+		open-plc-utils-setpib open-plc-utils-hpavkey open-plc-utils-amphost \
+		open-plc-utils-plctool open-plc-utils-pibdump open-plc-utils-plcstat \
+		ebtables hostapd-utils wifitoggle wpad
+endef
+LEGACY_DEVICES += dLAN_pro_500_wp
+
+define LegacyDevice/dLAN_pro_1200_ac
+	DEVICE_TITLE := devolo dLAN pro 1200+ WiFi ac
+	DEVICE_PACKAGES := open-plc-utils open-plc-utils-chkpib open-plc-utils-getpib open-plc-utils-modpib \
+		open-plc-utils-setpib open-plc-utils-hpavkey open-plc-utils-plchost \
+		open-plc-utils-plctool open-plc-utils-pibdump open-plc-utils-plcstat \
+		ebtables hostapd-utils wifitoggle wpad ip-full kmod-ath10k kmod-leds-gpio \
+		kmod-ledtrig-gpio
+endef
+LEGACY_DEVICES += dLAN_pro_1200_ac
+
+define LegacyDevice/DHP1565A1
+	DEVICE_TITLE := D-Link DHP-1565 rev. A1
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2
+endef
+LEGACY_DEVICES += DHP1565A1
+
+define LegacyDevice/DIR505A1
+	DEVICE_TITLE := D-Link DIR-505 rev. A1
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+LEGACY_DEVICES += DIR505A1
+
+define LegacyDevice/DIR600A1
+	DEVICE_TITLE := D-Link DIR-600 rev. A1
+endef
+LEGACY_DEVICES += DIR600A1
+
+define LegacyDevice/DIR601A1
+	DEVICE_TITLE := D-Link DIR-601 rev. A1
+endef
+LEGACY_DEVICES += DIR601A1
+
+define LegacyDevice/FR54RTR
+	DEVICE_TITLE := Frys FR-54RTR
+endef
+LEGACY_DEVICES += FR54RTR
+
+define LegacyDevice/DIR601B1
+	DEVICE_TITLE := D-Link DIR-601 rev. B1
+endef
+LEGACY_DEVICES += DIR601B1
+
+define LegacyDevice/DIR615C1
+	DEVICE_TITLE := D-Link DIR-615 rev. C1
+endef
+LEGACY_DEVICES += DIR615C1
+
+define LegacyDevice/DIR615E1
+	DEVICE_TITLE := D-Link DIR-615 rev. E1
+endef
+LEGACY_DEVICES += DIR615E1
+
+define LegacyDevice/DIR615E4
+	DEVICE_TITLE := D-Link DIR-615 rev. E4
+endef
+LEGACY_DEVICES += DIR615E4
+
+define LegacyDevice/DIR615IX
+	DEVICE_TITLE := D-Link DIR-615 rev. I1
+endef
+LEGACY_DEVICES += DIR615IX
+
+define LegacyDevice/DIR825B1
+	DEVICE_TITLE := D-Link DIR-825 rev. B1
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev
+endef
+LEGACY_DEVICES += DIR825B1
+
+define LegacyDevice/DIR825C1
+	DEVICE_TITLE := D-Link DIR-825 rev. C1
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+LEGACY_DEVICES += DIR825C1
+
+define LegacyDevice/DIR835A1
+	DEVICE_TITLE := D-Link DIR-835 rev. A1
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2
+endef
+LEGACY_DEVICES += DIR835A1
+
+define LegacyDevice/DGL5500A1
+	DEVICE_TITLE := D-Link DGL-5500 rev. A1
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k
+endef
+LEGACY_DEVICES += DGL5500A1
+
+define LegacyDevice/DRAGINO2
+	DEVICE_TITLE := DRAGINO2
+	DEVICE_PACKAGES := kmod-ath9k kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev
+endef
+LEGACY_DEVICES += DRAGINO2
+
+define LegacyDevice/EAP300V2
+	DEVICE_TITLE := EnGenius EAP300V2
+endef
+LEGACY_DEVICES += EAP300V2
+
+define LegacyDevice/ESR900
+	DEVICE_TITLE := EnGenius ESR900
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+LEGACY_DEVICES += ESR900
+
+define LegacyDevice/ESR1750
+        DEVICE_TITLE := EnGenius ESR1750
+        DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-ath10k wpad-mini
+endef
+LEGACY_DEVICES += ESR1750
+
+define LegacyDevice/EPG5000
+        DEVICE_TITLE := EnGenius EPG5000
+        DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-ath10k wpad-mini
+endef
+LEGACY_DEVICES += EPG5000
+
+define LegacyDevice/EWDORIN
+	DEVICE_TITLE := Embedded Wireless Dorin Platform
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev kmod-usb-storage \
+		kmod-fs-vfat kmod-fs-msdos kmod-fs-ntfs kmod-fs-ext4 \
+		kmod-nls-cp437 kmod-nls-cp850 kmod-nls-cp852 kmod-nls-iso8859-1 kmod-nls-utf8
+endef
+LEGACY_DEVICES += EWDORIN
+
+define LegacyDevice/HIWIFI_HC6361
+	DEVICE_TITLE := HiWiFi HC6361
+	DEVICE_PACKAGES :=  kmod-usb-core kmod-usb2 kmod-usb-storage \
+		kmod-crypto-deflate kmod-fs-ext4 kmod-ledtrig-gpio \
+		kmod-nls-iso8859-1 e2fsprogs
+endef
+LEGACY_DEVICES += HIWIFI_HC6361
+
+define LegacyDevice/JA76PF
+	DEVICE_TITLE := jjPlus JA76PF
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-hwmon-core kmod-i2c-core kmod-hwmon-lm75
+endef
+LEGACY_DEVICES += JA76PF
+
+define LegacyDevice/JA76PF2
+	DEVICE_TITLE := jjPlus JA76PF2
+endef
+LEGACY_DEVICES += JA76PF2
+
+define LegacyDevice/JWAP003
+	DEVICE_TITLE := jjPlus JWAP003
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2
+endef
+LEGACY_DEVICES += JWAP003
+
+define LegacyDevice/WRT160NL
+	DEVICE_TITLE := Linksys WRT160NL
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2
+endef
+LEGACY_DEVICES += WRT160NL
+
+define LegacyDevice/WRT400N
+	DEVICE_TITLE := Linksys WRT400N
+endef
+LEGACY_DEVICES += WRT400N
+
+define LegacyDevice/MR12
+	DEVICE_TITLE := Meraki MR12
+	DEVICE_PACKAGES := kmod-spi-gpio kmod-ath9k
+endef
+LEGACY_DEVICES += MR12
+
+define LegacyDevice/MR16
+	DEVICE_TITLE := Meraki MR16
+	DEVICE_PACKAGES := kmod-spi-gpio kmod-ath9k
+endef
+LEGACY_DEVICES += MR16
+
+define LegacyDevice/SMART-300
+        DEVICE_TITLE := NC-LINK SMART-300
+endef
+LEGACY_DEVICES += SMART-300
+
+define LegacyDevice/WNDAP360
+        DEVICE_TITLE := NETGEAR WNDAP360
+endef
+LEGACY_DEVICES += WNDAP360
+
+define LegacyDevice/WNR2000V3
+	DEVICE_TITLE := NETGEAR WNR2000V3
+	DEVICE_PACKAGES :=  -kmod-usb-core -kmod-usb-ohci -kmod-usb2 -kmod-ledtrig-usbdev
+endef
+LEGACY_DEVICES += WNR2000V3
+
+define LegacyDevice/WNR2000V4
+	DEVICE_TITLE := NETGEAR WNR2000V4
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+LEGACY_DEVICES += WNR2000V4
+
+define LegacyDevice/WNR612V2
+	DEVICE_TITLE := NETGEAR WNR612V2 / On Networks N150
+endef
+LEGACY_DEVICES += WNR612V2
+
+define LegacyDevice/WNR1000V2
+	DEVICE_TITLE := NETGEAR WNR1000V2
+endef
+LEGACY_DEVICES += WNR1000V2
+
+define LegacyDevice/WNR2200
+  DEVICE_TITLE := NETGEAR WNR2200
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+LEGACY_DEVICES += WNR2200
+
+define LegacyDevice/WPN824N
+	DEVICE_TITLE := NETGEAR WPN824N
+endef
+LEGACY_DEVICES += WPN824N
+
+define LegacyDevice/OM5P
+	DEVICE_TITLE := OpenMesh OM5P/OM5P-AN
+	DEVICE_PACKAGES := kmod-ath9k om-watchdog
+endef
+LEGACY_DEVICES += OM5P
+
+define LegacyDevice/OM5PAC
+	DEVICE_TITLE := OpenMesh OM5P-AC/OM5P-ACv2
+	DEVICE_PACKAGES := kmod-ath9k kmod-ath10k om-watchdog
+endef
+LEGACY_DEVICES += OM5PAC
+
+define LegacyDevice/MR600
+        DEVICE_TITLE := OpenMesh MR600
+        DEVICE_PACKAGES := kmod-ath9k om-watchdog
+endef
+LEGACY_DEVICES += MR600
+
+define LegacyDevice/MR900
+        DEVICE_TITLE := OpenMesh MR900/MR900v2
+        DEVICE_PACKAGES := kmod-ath9k om-watchdog
+endef
+LEGACY_DEVICES += MR900
+
+define LegacyDevice/MR1750
+        DEVICE_TITLE := OpenMesh MR1750/MR1750v2
+        DEVICE_PACKAGES := kmod-ath9k kmod-ath10k
+endef
+LEGACY_DEVICES += MR1750
+
+define LegacyDevice/OPENMESH
+	DEVICE_TITLE := OpenMesh products
+	DEVICE_PACKAGES := kmod-ath9k kmod-ath10k om-watchdog
+endef
+LEGACY_DEVICES += OPENMESH
+
+define LegacyDevice/UBDEV01
+	DEVICE_TITLE := PowerCloud Systems ubdev01 model
+endef
+LEGACY_DEVICES += UBDEV01
+
+define LegacyDevice/DLRTDEV01
+	DEVICE_TITLE := PowerCloud Systems dlrtdev01 model
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev
+endef
+LEGACY_DEVICES += DLRTDEV01
+
+define LegacyDevice/MZKW04NU
+	DEVICE_TITLE := Planex MZK-W04NU
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+LEGACY_DEVICES += MZKW04NU
+
+define LegacyDevice/MZKW300NH
+	DEVICE_TITLE := Planex MZK-W300NH
+endef
+LEGACY_DEVICES += MZKW300NH
+
+define LegacyDevice/QIHOO360
+	DEVICE_TITLE := Qihoo 360 C301
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-ath10k
+endef
+LEGACY_DEVICES += QIHOO360
+
+define LegacyDevice/RW2458N
+	DEVICE_TITLE := Redwave RW2458N
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-ath9k wpad-mini
+endef
+LEGACY_DEVICES += RW2458N
+
+define LegacyDevice/CAP4200AG
+	DEVICE_TITLE := Senao CAP4200AG
+	DEVICE_PACKAGES := kmod-ath9k
+endef
+LEGACY_DEVICES += CAP4200AG
+
+define LegacyDevice/EAP7660D
+	DEVICE_TITLE := Senao EAP7660D
+endef
+LEGACY_DEVICES += EAP7660D
+
+define LegacyDevice/WLR8100
+        DEVICE_TITLE := Sitecom WLR-8100
+        DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-usb3
+endef
+LEGACY_DEVICES += WLR8100
+
+define LegacyDevice/TEW632BRP
+	DEVICE_TITLE := TRENDNet TEW-632BRP
+endef
+LEGACY_DEVICES += TEW632BRP
+
+define LegacyDevice/TEW652BRP
+	DEVICE_TITLE := TRENDNet TEW-652BRP
+endef
+LEGACY_DEVICES += TEW652BRP
+
+define LegacyDevice/TEW673GRU
+	DEVICE_TITLE := TRENDNet TEW-673GRU
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2
+endef
+LEGACY_DEVICES += TEW673GRU
+
+define LegacyDevice/TEW712BR
+	DEVICE_TITLE := TRENDNet TEW-712BR
+endef
+LEGACY_DEVICES += TEW712BR
+
+define LegacyDevice/TEW732BR
+	DEVICE_TITLE := TRENDNet TEW-732BR
+endef
+LEGACY_DEVICES += TEW732BR
+
+define LegacyDevice/TEW823DRU
+	DEVICE_TITLE := TRENDNet TEW-823DRU
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k
+endef
+LEGACY_DEVICES += TEW823DRU
+
+define LegacyDevice/DR344
+	DEVICE_TITLE := Wallys DR344
+endef
+LEGACY_DEVICES += DR344
+
+define LegacyDevice/MYNETN600
+	DEVICE_TITLE := WD My Net N600
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2
+endef
+LEGACY_DEVICES += MYNETN600
+
+define LegacyDevice/MYNETN750
+	DEVICE_TITLE := WD My Net N750
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2
+endef
+LEGACY_DEVICES += MYNETN750
+
+define LegacyDevice/MYNETREXT
+	DEVICE_TITLE := WD My Net Wi-Fi Range Extender
+	DEVICE_PACKAGES := rssileds
+endef
+LEGACY_DEVICES += MYNETREXT
+
+define LegacyDevice/WRTNODE2Q
+	DEVICE_TITLE := WRTnode2Q board
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage
+endef
+LEGACY_DEVICES += WRTNODE2Q
+
+define LegacyDevice/ZCN1523H28
+	DEVICE_TITLE := Zcomax ZCN-1523H-2-8
+endef
+LEGACY_DEVICES += ZCN1523H28
+
+define LegacyDevice/ZCN1523H516
+	DEVICE_TITLE := Zcomax ZCN-1523H-5-16
+endef
+LEGACY_DEVICES += ZCN1523H516
+
+define LegacyDevice/NBG_460N_550N_550NH
+	DEVICE_TITLE := Zyxel NBG 460N/550N/550NH
+	DEVICE_PACKAGES := kmod-rtc-pcf8563
+endef
+LEGACY_DEVICES += NBG_460N_550N_550NH
+
+define LegacyDevice/R6100
+	DEVICE_TITLE := NETGEAR R6100
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev
+endef
+LEGACY_DEVICES += R6100
+
+define LegacyDevice/WNDR4300
+	DEVICE_TITLE := NETGEAR WNDR3700v4/WNDR4300
+	DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev
+endef
+LEGACY_DEVICES += WNDR4300
+
+define LegacyDevice/NBG6716
+	DEVICE_TITLE := Zyxel NBG 6716
+	DEVICE_PACKAGES := kmod-rtc-pcf8563 kmod-ath10k
+endef
+LEGACY_DEVICES += NBG6716
diff --git a/target/linux/ar71xx/image/legacy.mk b/target/linux/ar71xx/image/legacy.mk
index 1556573b5f..8446bcbb6f 100644
--- a/target/linux/ar71xx/image/legacy.mk
+++ b/target/linux/ar71xx/image/legacy.mk
@@ -1,3 +1,4 @@
+include ./legacy-devices.mk
 rootfs_type=$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))
 
 # $(1): rootfs type.
@@ -145,16 +146,16 @@ endif
 # $(6): padding size.
 define CatFiles
 	if [ $(2) -eq 0 ]; then \
-		filename="$(3)"; fstype=$$$${filename##*\.}; \
-		case "$$$${fstype}" in \
+		filename="$(3)"; fstype=$${filename##*\.}; \
+		case "$${fstype}" in \
 		"jffs2-64k") bs=65536;; \
 		"jffs2-128k") bs=131072;; \
 		"jffs2-256k") bs=262144;; \
 		*) bs=`stat -c%s $(1)`;; \
 		esac; \
-		( dd if=$(1) bs=$$$${bs} conv=sync;  cat $(3) ) > $(5); \
+		( dd if=$(1) bs=$${bs} conv=sync;  cat $(3) ) > $(5); \
 		if [ -n "$(6)" ]; then \
-			case "$$$${fstype}" in \
+			case "$${fstype}" in \
 			squashfs*) \
 				padjffs2 $(5) $(6); \
 				;; \
@@ -356,7 +357,7 @@ endef
 define Image/Build/CameoAP94
 	$(eval fwsize=$(call mtdpartsize,firmware,$(4)))
 	$(eval fwsize_fat=$(call mtdpartsize,firmware,$(5)))
-	$(call Sysupgrade/KRuImage,$(1),$(2),0,$$$$(($(fwsize)-4*64*1024)),64)
+	$(call Sysupgrade/KRuImage,$(1),$(2),0,$$(($(fwsize)-4*64*1024)),64)
 	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
 		( \
 			dd if=$(call sysupname,$(1),$(2)); \
@@ -371,7 +372,7 @@ define Image/Build/CameoAP94
 			) > $(call factoryname,$(1),$(2)); \
 		fi; \
 	fi
-	$(call CatFiles,$(KDIR_TMP)/vmlinux-$(2)-fat.uImage,0,$(KDIR)/root.$(1),$$$$(($(fwsize_fat)-4*64*1024)),$(KDIR_TMP)/$(2)-fat.bin,64)
+	$(call CatFiles,$(KDIR_TMP)/vmlinux-$(2)-fat.uImage,0,$(KDIR)/root.$(1),$$(($(fwsize_fat)-4*64*1024)),$(KDIR_TMP)/$(2)-fat.bin,64)
 	if [ -e "$(KDIR_TMP)/$(2)-fat.bin" ]; then \
 		echo -n "" > $(KDIR_TMP)/$(2)-fat.dummy; \
 		sh $(TOPDIR)/scripts/combined-image.sh \
@@ -382,7 +383,7 @@ define Image/Build/CameoAP94
 endef
 
 define Image/Build/WZRHP
-	$(call Sysupgrade/KRuImage,$(1),$(2),0,$$$$(($(3)-4*$(4)*1024)),$(4))
+	$(call Sysupgrade/KRuImage,$(1),$(2),0,$$(($(3)-4*$(4)*1024)),$(4))
 	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
 		( \
 			echo -n -e "# Airstation Public Fmt1\x00\x00\x00\x00\x00\x00\x00\x00"; \
@@ -412,7 +413,7 @@ Image/Build/WHRHPG300N/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
 
 define Image/Build/WHRHPG300N
 	$(eval fwsize=$(call mtdpartsize,firmware,$(4)))
-	$(call Sysupgrade/KRuImage,$(1),$(2),0,$$$$(($(fwsize)-4*64*1024)),64)
+	$(call Sysupgrade/KRuImage,$(1),$(2),0,$$(($(fwsize)-4*64*1024)),64)
 	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
 		( \
 			echo -n -e "# Airstation Public Fmt1\x00\x00\x00\x00\x00\x00\x00\x00"; \
@@ -431,11 +432,11 @@ endef
 
 define Image/Build/Cameo
 	$(eval fwsize=$(call mtdpartsize,firmware,$(4)))
-	$(call Sysupgrade/KRuImage,$(1),$(2),0,$$$$(($(fwsize)-4*64*1024)),64)
+	$(call Sysupgrade/KRuImage,$(1),$(2),0,$$(($(fwsize)-4*64*1024)),64)
 	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
-		factory_size=$$$$(($(fwsize) - $(6))); \
+		factory_size=$$(($(fwsize) - $(6))); \
 		( \
-			dd if=$(call sysupname,$(1),$(2)) bs=$$$${factory_size} conv=sync; \
+			dd if=$(call sysupname,$(1),$(2)) bs=$${factory_size} conv=sync; \
 			echo -n $(5); \
 		) > $(call factoryname,$(1),$(2)); \
 	fi
@@ -471,15 +472,15 @@ Image/Build/CameoDB120_8M/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(ca
 
 define Image/Build/CameoHornet
 	$(eval fwsize=$(call mtdpartsize,firmware,$(4)))
-	$(call Sysupgrade/KRuImage,$(1),$(2),0,$$$$(($(fwsize)-4*64*1024)),64)
+	$(call Sysupgrade/KRuImage,$(1),$(2),0,$$(($(fwsize)-4*64*1024)),64)
 	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
 		for r in $(7); do \
-			[ -n "$$$$r" ] && dashr="-$$$$r" || dashr=; \
-			[ -z "$$$$r" ] && r="DEF"; \
-			mkcameofw -M HORNET -R "$$$$r" -S $(5) -V $(6) -c \
+			[ -n "$$r" ] && dashr="-$$r" || dashr=; \
+			[ -z "$$r" ] && r="DEF"; \
+			mkcameofw -M HORNET -R "$$r" -S $(5) -V $(6) -c \
 				-K $(8) -I $(fwsize) \
 				-k "$(call sysupname,$(1),$(2))" \
-				-o $(call imgname,$(1),$(2))-factory$$$$dashr.bin; \
+				-o $(call imgname,$(1),$(2))-factory$$dashr.bin; \
 			true; \
 		done; \
 	fi
@@ -623,7 +624,7 @@ endef
 
 define Image/Build/Planex
 	$(eval fwsize=$(call mtdpartsize,firmware,$(planex_mtdlayout)))
-	$(call Sysupgrade/KRuImage,$(1),$(2),0,$$$$(($(fwsize)-4*64*1024)),64)
+	$(call Sysupgrade/KRuImage,$(1),$(2),0,$$(($(fwsize)-4*64*1024)),64)
 	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
 		$(STAGING_DIR_HOST)/bin/mkplanexfw \
 			-B $(2) \
@@ -660,7 +661,7 @@ define Image/Build/Seama
 	[ -e "$(KDIR)/loader-$(2).bin" ]
 	$(call CompressLzma,$(KDIR)/loader-$(2).bin,$(KDIR_TMP)/loader-$(2).bin.lzma)
 	-rm -f $(KDIR_TMP)/image-$(2).tmp
-	$(call CatFiles,$(KDIR_TMP)/loader-$(2).bin.lzma,$$$$(($(6) - 64)),$(KDIR)/root.$(1),$(7),$(KDIR_TMP)/image-$(2).tmp)
+	$(call CatFiles,$(KDIR_TMP)/loader-$(2).bin.lzma,$$(($(6) - 64)),$(KDIR)/root.$(1),$(7),$(KDIR_TMP)/image-$(2).tmp)
 	[ -e "$(KDIR_TMP)/image-$(2).tmp" ] && { \
 		head -c -4 "$(KDIR_TMP)/image-$(2).tmp" > "$(KDIR_TMP)/image-$(2).no-jffs2mark.tmp"; \
 		$(STAGING_DIR_HOST)/bin/seama \
@@ -760,11 +761,11 @@ define Image/Build/Netgear
 	$(call CatFiles,$(KDIR_TMP)/vmlinux-$(2).uImage.squashfs,0,$(KDIR)/root.$(1),$(fwsize),$(call sysupname,$(1),$(2)),64)
 	if [ -e $(call sysupname,$(1),$(2)) ]; then \
 		for r in $(7) ; do \
-			[ -n "$$$$r" ] && dashr="-$$$$r" || dashr= ; \
+			[ -n "$$r" ] && dashr="-$$r" || dashr= ; \
 			$(STAGING_DIR_HOST)/bin/mkdniimg \
-				-B $(6) -v OpenWrt.$(REVISION) -r "$$$$r" $(8) \
+				-B $(6) -v OpenWrt.$(REVISION) -r "$$r" $(8) \
 				-i $(call sysupname,$(1),$(2)) \
-				-o $(call imgname,$(1),$(2))-factory$$$$dashr.img; \
+				-o $(call imgname,$(1),$(2))-factory$$dashr.img; \
 		done; \
 	fi
 endef
@@ -791,7 +792,7 @@ define Image/Build/NetgearNAND/buildkernel
 	$(call PatchKernelLzma,$(2),$(3) $(4),-d20)
 	dd if=$(KDIR_TMP)/vmlinux-$(2).bin.lzma \
 		of=$(KDIR_TMP)/vmlinux-$(2).bin.tmp \
-		bs=$$$$(($(kernelsize)-131072-2*64-1)) \
+		bs=$$(($(kernelsize)-131072-2*64-1)) \
 		count=1 conv=sync
 	$(call MkuImage,lzma,-M $(5),$(KDIR_TMP)/vmlinux-$(2).bin.tmp,$(KDIR_TMP)/vmlinux-$(2).uImage)
 	echo -ne '\xff' >> $(KDIR_TMP)/vmlinux-$(2).uImage
@@ -830,7 +831,7 @@ define Image/Build/NetgearNAND
 		dd if=$(KDIR_TMP)/$(2)-root.ubi \
 	) > $(imageraw)
 	$(STAGING_DIR_HOST)/bin/mkdniimg \
-		-B $(6) -v OpenWrt.$(REVISION) -r "$$$$r" $(8) \
+		-B $(6) -v OpenWrt.$(REVISION) -r "$$r" $(8) \
 		-i $(imageraw) \
 		-o $(call imgname,ubi,$(2))-factory.img
 
@@ -865,7 +866,7 @@ define	Image/Build/ZyXELNAND/buildkernel
 		--pad=$(kernelsize) --big-endian --squash-uids -v -e 128KiB \
 		-o $(KDIR_TMP)/$(2)-kernel.jffs2 \
 		-d $(KDIR_TMP)/$(2)/image \
-		2>&1 1>/dev/null | awk '/^.+$$$$/'
+		2>&1 1>/dev/null | awk '/^.+$$/'
 	-rm -rf $(KDIR_TMP)/$(2)
 endef
 
@@ -918,7 +919,7 @@ define Image/Build/Zcomax
 		$(STAGING_DIR_HOST)/bin/mkzcfw \
 			-B $(2) \
 			-k $(KDIR_TMP)/vmlinux-$(2).uImage \
-			-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
+			-r $(KDIR)/root.$(1) \
 			-o $(call imgname,$(1),$(2))-factory.img; \
 	fi
 endef
@@ -1204,9 +1205,3 @@ define Image/Build/Profile
 	$(call Image/Build/Profile/$(1),buildkernel)
 	$(call Image/Build/Profile/$(1),$(2))
 endef
-
-# $(1): filesystem type.
-define Image/Build
-	$(call Image/Build/$(call rootfs_type,$(1)),$(1))
-	$(call Image/Build/Profile/$(IMAGE_PROFILE),$(1))
-endef
diff --git a/target/linux/ar71xx/image/nand.mk b/target/linux/ar71xx/image/nand.mk
index ec97271c75..8e098b0d40 100644
--- a/target/linux/ar71xx/image/nand.mk
+++ b/target/linux/ar71xx/image/nand.mk
@@ -7,6 +7,8 @@ define Build/MerakiNAND
 endef
 
 define Device/mr18
+  DEVICE_TITLE := Meraki MR18
+  DEVICE_PACKAGES := kmod-spi-gpio kmod-ath9k
   BOARDNAME = MR18
   BLOCKSIZE := 64k
   CONSOLE = ttyS0,115200
diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
index 713a28fca7..ccb1f5bfac 100644
--- a/target/linux/ar71xx/image/tp-link.mk
+++ b/target/linux/ar71xx/image/tp-link.mk
@@ -86,6 +86,8 @@ $(Device/tplink)
 endef
 
 define Device/cpe510-520
+  DEVICE_TITLE := TP-LINK CPE510/520
+  DEVICE_PACKAGES := rssileds
   MTDPARTS := spi0.0:128k(u-boot)ro,64k(pation-table)ro,64k(product-info)ro,1536k(kernel),6144k(rootfs),192k(config)ro,64k(ART)ro,7680k@0x40000(firmware)
   IMAGE_SIZE := 7680k
   BOARDNAME := CPE510
@@ -100,6 +102,8 @@ endef
 
 define Device/cpe210-220
 $(Device/cpe510-520)
+  DEVICE_TITLE := TP-LINK CPE210/220
+  DEVICE_PACKAGES := rssileds
   BOARDNAME := CPE210
   TPLINK_BOARD_NAME := CPE210
 endef
@@ -107,6 +111,8 @@ TARGET_DEVICES += cpe210-220 cpe510-520
 
 define Device/tl-wdr4300-v1
 $(Device/tplink-8mlzma)
+  DEVICE_TITLE := TP-LINK TL-WDR4300
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
   BOARDNAME = TL-WDR4300
   DEVICE_PROFILE = TLWDR4300
   TPLINK_HWID := 0x43000001
@@ -114,33 +120,40 @@ endef
 
 define Device/tl-wdr3500-v1
 $(Device/tl-wdr4300-v1)
+  DEVICE_TITLE := TP-LINK TL-WDR3500 v1
   BOARDNAME = TL-WDR3500
   TPLINK_HWID := 0x35000001
 endef
 
 define Device/tl-wdr3600-v1
 $(Device/tl-wdr4300-v1)
+  DEVICE_TITLE := TP-LINK TL-WDR3600 v1
   TPLINK_HWID := 0x36000001
 endef
 
 define Device/tl-wdr4300-v1-il
 $(Device/tl-wdr4300-v1)
+  DEVICE_TITLE := TP-LINK TL-WDR4300 v1 IL
   TPLINK_HWID := 0x43008001
 endef
 
 define Device/tl-wdr4310-v1
 $(Device/tl-wdr4300-v1)
+  DEVICE_TITLE := TP-LINK TL-WDR4310 v1
   TPLINK_HWID := 0x43100001
 endef
 
 define Device/mw4530r-v1
 $(Device/tl-wdr4300-v1)
+  DEVICE_TITLE := TP-LINK TL-WDR4530 v1
   TPLINK_HWID := 0x45300001
 endef
 TARGET_DEVICES += tl-wdr3500-v1 tl-wdr3600-v1 tl-wdr4300-v1 tl-wdr4300-v1-il tl-wdr4310-v1 mw4530r-v1
 
 define Device/tl-wdr6500-v2
 $(Device/tplink-8mlzma)
+  DEVICE_TITLE := TP-LINK TL-WDR6500v2
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-ath10k
   KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma
   KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | uImage lzma | mktplinkfw-initramfs
   BOARDNAME = TL-WDR6500-v2
@@ -152,6 +165,8 @@ TARGET_DEVICES += tl-wdr6500-v2
 
 define Device/tl-wdr3320-v2
 $(Device/tplink-4mlzma)
+  DEVICE_TITLE := TP-LINK TL-WDR3320v2
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
   BOARDNAME = TL-WDR3320-v2
   DEVICE_PROFILE = TLWDR3320V2
   TPLINK_HWID := 0x33200002
@@ -161,6 +176,8 @@ TARGET_DEVICES += tl-wdr3320-v2
 
 define Device/archer-c5-v1
     $(Device/tplink-16mlzma)
+    DEVICE_TITLE := TP-LINK Archer C5
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-ath10k
     BOARDNAME := ARCHER-C5
     DEVICE_PROFILE := ARCHERC7
     TPLINK_HWID := 0xc5000001
@@ -168,6 +185,8 @@ endef
 
 define Device/archer-c7-v1
     $(Device/tplink-8mlzma)
+    DEVICE_TITLE := TP-LINK Archer C7 v1
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-ath10k
     BOARDNAME := ARCHER-C7
     DEVICE_PROFILE := ARCHERC7
     TPLINK_HWID := 0x75000001
@@ -175,6 +194,8 @@ endef
 
 define Device/archer-c7-v2
     $(Device/tplink-16mlzma)
+    DEVICE_TITLE := TP-LINK Archer C7 v2
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-ath10k
     BOARDNAME := ARCHER-C7-V2
     DEVICE_PROFILE := ARCHERC7
     TPLINK_HWID := 0xc7000002
@@ -183,6 +204,8 @@ endef
 
 define Device/tl-wdr7500-v3
     $(Device/tplink-8mlzma)
+    DEVICE_TITLE := TP-LINK Archer C7 v3
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-ath10k
     BOARDNAME := ARCHER-C7
     DEVICE_PROFILE := ARCHERC7
     TPLINK_HWID := 0x75000003
@@ -191,6 +214,8 @@ TARGET_DEVICES += archer-c5-v1 archer-c7-v1 archer-c7-v2 tl-wdr7500-v3
 
 define Device/tl-mr10u-v1
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-MR10U
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2
     BOARDNAME := TL-MR10U
     DEVICE_PROFILE := TLMR10U
     TPLINK_HWID := 0x00100101
@@ -199,6 +224,8 @@ endef
 
 define Device/tl-mr11u-v1
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-MR11U
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
     BOARDNAME := TL-MR11U
     DEVICE_PROFILE := TLMR11U
     TPLINK_HWID := 0x00110101
@@ -207,6 +234,8 @@ endef
 
 define Device/tl-mr11u-v2
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-MR11U v2
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
     BOARDNAME := TL-MR11U
     DEVICE_PROFILE := TLMR11U
     TPLINK_HWID := 0x00110102
@@ -215,6 +244,8 @@ endef
 
 define Device/tl-mr12u-v1
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-MR12U
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
     BOARDNAME := TL-MR13U
     DEVICE_PROFILE := TLMR12U
     TPLINK_HWID := 0x00120101
@@ -223,6 +254,8 @@ endef
 
 define Device/tl-mr13u-v1
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-MR13U
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
     BOARDNAME := TL-MR13U
     DEVICE_PROFILE := TLMR13U
     TPLINK_HWID := 0x00130101
@@ -232,6 +265,8 @@ TARGET_DEVICES += tl-mr10u-v1 tl-mr11u-v1 tl-mr11u-v2 tl-mr12u-v1 tl-mr13u-v1
 
 define Device/tl-mr3020-v1
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-MR3020
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
     BOARDNAME := TL-MR3020
     DEVICE_PROFILE := TLMR3020
     TPLINK_HWID := 0x30200001
@@ -240,6 +275,8 @@ endef
 
 define Device/tl-mr3040-v1
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-MR3040
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
     BOARDNAME := TL-MR3040
     DEVICE_PROFILE := TLMR3040
     TPLINK_HWID := 0x30400001
@@ -248,6 +285,8 @@ endef
 
 define Device/tl-mr3040-v2
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-MR3040
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
     BOARDNAME := TL-MR3040-v2
     DEVICE_PROFILE := TLMR3040
     TPLINK_HWID := 0x30400002
@@ -256,6 +295,8 @@ endef
 
 define Device/tl-mr3220-v1
     $(Device/tplink-4m)
+    DEVICE_TITLE := TP-LINK TL-MR3220
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
     BOARDNAME := TL-MR3220
     DEVICE_PROFILE := TLMR3220
     TPLINK_HWID := 0x32200001
@@ -263,6 +304,8 @@ endef
 
 define Device/tl-mr3220-v2
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-MR3220 v2
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
     BOARDNAME := TL-MR3220-v2
     DEVICE_PROFILE := TLMR3220
     TPLINK_HWID := 0x32200002
@@ -271,6 +314,8 @@ endef
 
 define Device/tl-mr3420-v1
     $(Device/tplink-4m)
+    DEVICE_TITLE := TP-LINK TL-MR3420
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
     BOARDNAME := TL-MR3420
     DEVICE_PROFILE := TLMR3420
     TPLINK_HWID := 0x34200001
@@ -278,6 +323,8 @@ endef
 
 define Device/tl-mr3420-v2
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-MR3420 v2
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
     BOARDNAME := TL-MR3420-v2
     DEVICE_PROFILE := TLMR3420
     TPLINK_HWID := 0x34200002
@@ -286,6 +333,8 @@ TARGET_DEVICES += tl-mr3020-v1 tl-mr3040-v1 tl-mr3040-v2 tl-mr3220-v1 tl-mr3220-
 
 define Device/tl-wr703n-v1
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR703N
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2
     BOARDNAME := TL-WR703N
     DEVICE_PROFILE := TLWR703
     TPLINK_HWID := 0x07030101
@@ -294,6 +343,8 @@ endef
 
 define Device/tl-wr710n-v1
     $(Device/tplink-8mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR710N
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2
     BOARDNAME := TL-WR710N
     DEVICE_PROFILE := TLWR710
     TPLINK_HWID := 0x07100001
@@ -302,7 +353,9 @@ endef
 
 define Device/tl-wr710n-v2
     $(Device/tplink-4mlzma)
-    BOARDNAME := TL-WR710N
+    DEVICE_TITLE := TP-LINK TL-WR710N v2
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2
+    BOARDNAME := TL-WR710N v2
     DEVICE_PROFILE := TLWR710
     TPLINK_HWID := 0x07100002
     CONSOLE := ttyATH0,115200
@@ -310,7 +363,9 @@ endef
 
 define Device/tl-wr710n-v2.1
     $(Device/tplink-8mlzma)
-    BOARDNAME := TL-WR710N
+    DEVICE_TITLE := TP-LINK TL-WR710N v2.1
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2
+    BOARDNAME := TL-WR710N v2.1
     DEVICE_PROFILE := TLWR710
     TPLINK_HWID := 0x07100002
     TPLINK_HWREV := 0x00000002
@@ -319,6 +374,8 @@ endef
 
 define Device/tl-wr720n-v3
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR720N v3
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2
     BOARDNAME := TL-WR720N-v3
     DEVICE_PROFILE := TLWR720
     TPLINK_HWID := 0x07200103
@@ -327,6 +384,8 @@ endef
 
 define Device/tl-wr720n-v4
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR720N v4
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2
     BOARDNAME := TL-WR720N-v3
     DEVICE_PROFILE := TLWR720
     TPLINK_HWID := 0x07200104
@@ -336,6 +395,7 @@ TARGET_DEVICES += tl-wr703n-v1 tl-wr710n-v1 tl-wr710n-v2 tl-wr710n-v2.1 tl-wr720
 
 define Device/tl-wr740n-v1
     $(Device/tplink-4m)
+    DEVICE_TITLE := TP-LINK TL-WR740N/ND v1
     BOARDNAME := TL-WR741ND
     DEVICE_PROFILE := TLWR740
     TPLINK_HWID := 0x07400001
@@ -343,6 +403,7 @@ endef
 
 define Device/tl-wr740n-v3
     $(Device/tplink-4m)
+    DEVICE_TITLE := TP-LINK TL-WR740N/ND v3
     BOARDNAME := TL-WR741ND
     DEVICE_PROFILE := TLWR740
     TPLINK_HWID := 0x07400003
@@ -350,6 +411,7 @@ endef
 
 define Device/tl-wr740n-v4
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR740N/ND v4
     BOARDNAME := TL-WR741ND-v4
     DEVICE_PROFILE := TLWR740
     TPLINK_HWID := 0x07400004
@@ -358,6 +420,7 @@ endef
 
 define Device/tl-wr740n-v5
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR740N/ND v5
     BOARDNAME := TL-WR741ND-v4
     DEVICE_PROFILE := TLWR740
     TPLINK_HWID := 0x07400005
@@ -366,6 +429,7 @@ endef
 
 define Device/tl-wr740n-v6
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR740N/ND v6
     BOARDNAME := TL-WR841N-v9
     DEVICE_PROFILE := TLWR740
     TPLINK_HWID := 0x07400006
@@ -373,6 +437,7 @@ endef
 
 define Device/tl-wr741nd-v1
     $(Device/tplink-4m)
+    DEVICE_TITLE := TP-LINK TL-WR741N/ND v1
     BOARDNAME := TL-WR741ND
     DEVICE_PROFILE := TLWR741
     TPLINK_HWID := 0x07410001
@@ -380,6 +445,7 @@ endef
 
 define Device/tl-wr741nd-v2
     $(Device/tplink-4m)
+    DEVICE_TITLE := TP-LINK TL-WR741N/ND v2
     BOARDNAME := TL-WR741ND
     DEVICE_PROFILE := TLWR741
     TPLINK_HWID := 0x07410001
@@ -387,6 +453,7 @@ endef
 
 define Device/tl-wr741nd-v4
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR741N/ND v4
     BOARDNAME := TL-WR741ND-v4
     DEVICE_PROFILE := TLWR741
     TPLINK_HWID := 0x07410004
@@ -395,6 +462,7 @@ endef
 
 define Device/tl-wr741nd-v5
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR741N/ND v5
     BOARDNAME := TL-WR741ND-v4
     DEVICE_PROFILE := TLWR741
     TPLINK_HWID := 0x07400005
@@ -403,6 +471,8 @@ endef
 
 define Device/tl-wr810n
     $(Device/tplink-8mlzma)
+    DEVICE_TITLE := TP-Link TL-WR810N
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2
     BOARDNAME := TL-WR810N
     DEVICE_PROFILE := TLWR810
     TPLINK_HWID := 0x08100001
@@ -411,6 +481,7 @@ TARGET_DEVICES += tl-wr810n
 
 define Device/tl-wr743nd-v1
     $(Device/tplink-4m)
+    DEVICE_TITLE := TP-LINK TL-WR743N/ND v1
     BOARDNAME := TL-WR741ND
     DEVICE_PROFILE := TLWR743
     TPLINK_HWID := 0x07430001
@@ -418,6 +489,7 @@ endef
 
 define Device/tl-wr743nd-v2
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR743N/ND v2
     BOARDNAME := TL-WR741ND-v4
     DEVICE_PROFILE := TLWR743
     TPLINK_HWID := 0x07430002
@@ -427,6 +499,7 @@ TARGET_DEVICES += tl-wr740n-v1 tl-wr740n-v3 tl-wr740n-v4 tl-wr740n-v5 tl-wr740n-
 
 define Device/tl-wr841-v1.5
     $(Device/tplink-4m)
+    DEVICE_TITLE := TP-LINK TL-WR841N/ND v1.5
     BOARDNAME := TL-WR841N-v1.5
     DEVICE_PROFILE := TLWR841
     TPLINK_HWID := 0x08410002
@@ -435,6 +508,7 @@ endef
 
 define Device/tl-wr841-v3
     $(Device/tplink-4m)
+    DEVICE_TITLE := TP-LINK TL-WR841N/ND v3
     BOARDNAME := TL-WR941ND
     DEVICE_PROFILE := TLWR841
     TPLINK_HWID := 0x08410003
@@ -443,6 +517,7 @@ endef
 
 define Device/tl-wr841-v5
     $(Device/tplink-4m)
+    DEVICE_TITLE := TP-LINK TL-WR841N/ND v5
     BOARDNAME := TL-WR741ND
     DEVICE_PROFILE := TLWR841
     TPLINK_HWID := 0x08410005
@@ -450,6 +525,7 @@ endef
 
 define Device/tl-wr841-v7
     $(Device/tplink-4m)
+    DEVICE_TITLE := TP-LINK TL-WR841N/ND v7
     BOARDNAME := TL-WR841N-v7
     DEVICE_PROFILE := TLWR841
     TPLINK_HWID := 0x08410007
@@ -457,6 +533,7 @@ endef
 
 define Device/tl-wr841-v8
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR841N/ND v8
     BOARDNAME := TL-WR841N-v8
     DEVICE_PROFILE := TLWR841
     TPLINK_HWID := 0x08410008
@@ -464,6 +541,7 @@ endef
 
 define Device/tl-wr841-v9
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR841N/ND v9
     BOARDNAME := TL-WR841N-v9
     DEVICE_PROFILE := TLWR841
     TPLINK_HWID := 0x08410009
@@ -471,6 +549,7 @@ endef
 
 define Device/tl-wr841-v10
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR841N/ND v10
     BOARDNAME := TL-WR841N-v9
     DEVICE_PROFILE := TLWR841
     TPLINK_HWID := 0x08410010
@@ -478,6 +557,7 @@ endef
 
 define Device/tl-wr841-v11
    $(Device/tplink-4mlzma)
+   DEVICE_TITLE := TP-LINK TL-WR841N/ND v11
    BOARDNAME := TL-WR841N-v11
    DEVICE_PROFILE := TLWR841
    TPLINK_HWID := 0x08410011
@@ -485,6 +565,8 @@ endef
 
 define Device/tl-wr842n-v1
     $(Device/tplink-8m)
+    DEVICE_TITLE := TP-LINK TL-WR842N/ND v1
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
     BOARDNAME := TL-MR3420
     DEVICE_PROFILE := TLWR842
     TPLINK_HWID := 0x08420001
@@ -492,6 +574,8 @@ endef
 
 define Device/tl-wr842n-v2
     $(Device/tplink-8mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR842N/ND v2
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
     BOARDNAME := TL-WR842N-v2
     DEVICE_PROFILE := TLWR842
     TPLINK_HWID := 0x8420002
@@ -499,6 +583,8 @@ endef
 
 define Device/tl-wr842n-v3
     $(Device/tplink-16mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR842N/ND v3
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
     BOARDNAME := TL-WR842N-v3
     DEVICE_PROFILE := TLWR842
     TPLINK_HWID := 0x08420003
@@ -506,6 +592,7 @@ endef
 
 define Device/tl-wr843nd-v1
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR843N/ND
     BOARDNAME := TL-WR841N-v8
     DEVICE_PROFILE := TLWR843
     TPLINK_HWID := 0x08430001
@@ -513,6 +600,7 @@ endef
 
 define Device/tl-wr847n-v8
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR847N/ND v8
     BOARDNAME := TL-WR841N-v8
     DEVICE_PROFILE := TLWR841
     TPLINK_HWID := 0x08470008
@@ -521,6 +609,7 @@ TARGET_DEVICES += tl-wr841-v1.5 tl-wr841-v3 tl-wr841-v5 tl-wr841-v7 tl-wr841-v8
 
 define Device/tl-wr941nd-v2
     $(Device/tplink-4m)
+    DEVICE_TITLE := TP-LINK TL-WR941N/ND v2
     BOARDNAME := TL-WR941ND
     DEVICE_PROFILE := TLWR941
     TPLINK_HWID := 0x09410002
@@ -529,6 +618,7 @@ endef
 
 define Device/tl-wr941nd-v3
     $(Device/tplink-4m)
+    DEVICE_TITLE := TP-LINK TL-WR941N/ND v3
     BOARDNAME := TL-WR941ND
     DEVICE_PROFILE := TLWR941
     TPLINK_HWID := 0x09410002
@@ -537,6 +627,7 @@ endef
 
 define Device/tl-wr941nd-v4
     $(Device/tplink-4m)
+    DEVICE_TITLE := TP-LINK TL-WR941N/ND v4
     BOARDNAME := TL-WR741ND
     DEVICE_PROFILE := TLWR941
     TPLINK_HWID := 0x09410004
@@ -544,6 +635,7 @@ endef
 
 define Device/tl-wr941nd-v5
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR941N/ND v5
     BOARDNAME := TL-WR941ND-v5
     DEVICE_PROFILE := TLWR941
     TPLINK_HWID := 0x09410005
@@ -551,6 +643,7 @@ endef
 
 define Device/tl-wr941nd-v6
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR941N/ND v6
     BOARDNAME := TL-WR941ND-v6
     DEVICE_PROFILE := TLWR941
     TPLINK_HWID := 0x09410006
@@ -559,6 +652,7 @@ endef
 # Chinese version (unlike European) is similar to the TL-WDR3500
 define Device/tl-wr941nd-v6-cn
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR941N/ND v6 (CN)
     BOARDNAME := TL-WDR3500
     DEVICE_PROFILE := TLWR941
     TPLINK_HWID := 0x09410006
@@ -567,6 +661,7 @@ TARGET_DEVICES += tl-wr941nd-v2 tl-wr941nd-v3 tl-wr941nd-v4 tl-wr941nd-v5 tl-wr9
 
 define Device/tl-wr1041n-v2
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR1041N
     BOARDNAME := TL-WR1041N-v2
     DEVICE_PROFILE := TLWR1041
     TPLINK_HWID := 0x10410002
@@ -575,6 +670,8 @@ TARGET_DEVICES += tl-wr1041n-v2
 
 define Device/tl-wr1043nd-v1
     $(Device/tplink-8m)
+    DEVICE_TITLE := TP-LINK TL-WR1043N/ND v1
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
     BOARDNAME := TL-WR1043ND
     DEVICE_PROFILE := TLWR1043
     TPLINK_HWID := 0x10430001
@@ -582,6 +679,8 @@ endef
 
 define Device/tl-wr1043nd-v2
     $(Device/tplink-8mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR1043N/ND v2
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
     BOARDNAME := TL-WR1043ND-v2
     DEVICE_PROFILE := TLWR1043
     TPLINK_HWID := 0x10430002
@@ -589,6 +688,8 @@ endef
 
 define Device/tl-wr1043nd-v3
     $(Device/tplink-8mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR1043N/ND v3
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
     BOARDNAME := TL-WR1043ND-v2
     DEVICE_PROFILE := TLWR1043
     TPLINK_HWID := 0x10430003
@@ -597,6 +698,8 @@ TARGET_DEVICES += tl-wr1043nd-v1 tl-wr1043nd-v2 tl-wr1043nd-v3
 
 define Device/tl-wr2543-v1
     $(Device/tplink-8mlzma)
+    DEVICE_TITLE := TP-LINK TL-WR2543N/ND
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
     BOARDNAME := TL-WR2543N
     DEVICE_PROFILE := TLWR2543
     TPLINK_HWID := 0x25430001
@@ -607,6 +710,8 @@ TARGET_DEVICES += tl-wr2543-v1
 
 define Device/tl-wdr4900-v2
     $(Device/tplink-8mlzma)
+    DEVICE_TITLE := TP-LINK TL-WDR4900v2
+    DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
     BOARDNAME := TL-WDR4900-v2
     DEVICE_PROFILE := TLWDR4900V2
     TPLINK_HWID := 0x49000002
@@ -615,6 +720,7 @@ TARGET_DEVICES += tl-wdr4900-v2
 
 define Device/tl-wa701nd-v1
     $(Device/tplink-4m)
+    DEVICE_TITLE := TP-LINK TL-WA701N/ND v1
     BOARDNAME := TL-WA901ND
     DEVICE_PROFILE := TLWA701
     TPLINK_HWID := 0x07010001
@@ -622,6 +728,7 @@ endef
 
 define Device/tl-wa701nd-v2
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WA701N/ND v2
     BOARDNAME := TL-WA701ND-v2
     DEVICE_PROFILE := TLWA701
     TPLINK_HWID := 0x07010002
@@ -630,6 +737,7 @@ endef
 
 define Device/tl-wa730re-v1
     $(Device/tplink-4m)
+    DEVICE_TITLE := TP-LINK TL-WA730RE
     BOARDNAME := TL-WA901ND
     DEVICE_PROFILE := TLWA730RE
     TPLINK_HWID := 0x07300001
@@ -637,6 +745,8 @@ endef
 
 define Device/tl-wa750re-v1
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WA750RE
+    DEVICE_PACKAGES := rssileds
     BOARDNAME := TL-WA750RE
     DEVICE_PROFILE := TLWA750
     TPLINK_HWID := 0x07500001
@@ -644,6 +754,7 @@ endef
 
 define Device/tl-wa7510n
     $(Device/tplink-4m)
+    DEVICE_TITLE := TP-LINK TL-WA7510N
     BOARDNAME := TL-WA7510N
     DEVICE_PROFILE := TLWA7510
     TPLINK_HWID := 0x75100001
@@ -652,6 +763,7 @@ TARGET_DEVICES += tl-wa701nd-v1 tl-wa701nd-v2 tl-wa730re-v1 tl-wa750re-v1 tl-wa7
 
 define Device/tl-wa801nd-v1
     $(Device/tplink-4m)
+    DEVICE_TITLE := TP-LINK TL-WA801N/ND v1
     BOARDNAME := TL-WA901ND
     DEVICE_PROFILE := TLWA801
     TPLINK_HWID := 0x08010001
@@ -659,6 +771,7 @@ endef
 
 define Device/tl-wa801nd-v2
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WA801N/ND v2
     BOARDNAME := TL-WA801ND-v2
     DEVICE_PROFILE := TLWA801
     TPLINK_HWID := 0x08010002
@@ -666,6 +779,7 @@ endef
 
 define Device/tl-wa801nd-v3
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WA801N/ND v3
     BOARDNAME := TL-WA801ND-v3
     DEVICE_PROFILE := TLWA801
     TPLINK_HWID := 0x08010003
@@ -673,6 +787,7 @@ endef
 
 define Device/tl-wa830re-v1
     $(Device/tplink-4m)
+    DEVICE_TITLE := TP-LINK TL-WA830RE
     BOARDNAME := TL-WA901ND
     DEVICE_PROFILE := TLWA830
     TPLINK_HWID := 0x08300010
@@ -680,6 +795,7 @@ endef
 
 define Device/tl-wa830re-v2
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WA830RE
     BOARDNAME := TL-WA830RE-v2
     DEVICE_PROFILE := TLWA830
     TPLINK_HWID := 0x08300002
@@ -687,6 +803,7 @@ endef
 
 define Device/tl-wa850re-v1
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WA850RE
     BOARDNAME := TL-WA850RE
     DEVICE_PROFILE := TLWA850
     TPLINK_HWID := 0x08500001
@@ -694,6 +811,7 @@ endef
 
 define Device/tl-wa860re-v1
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WA860RE
     BOARDNAME := TL-WA860RE
     DEVICE_PROFILE := TLWA860
     TPLINK_HWID := 0x08600001
@@ -702,6 +820,7 @@ TARGET_DEVICES += tl-wa801nd-v1 tl-wa801nd-v2 tl-wa801nd-v3 tl-wa830re-v1 tl-wa8
 
 define Device/tl-wa901nd-v1
     $(Device/tplink-4m)
+    DEVICE_TITLE := TP-LINK TL-WA901N/ND v1
     BOARDNAME := TL-WA901ND
     DEVICE_PROFILE := TLWA901
     TPLINK_HWID := 0x09010001
@@ -709,6 +828,7 @@ endef
 
 define Device/tl-wa901nd-v2
     $(Device/tplink-4m)
+    DEVICE_TITLE := TP-LINK TL-WA901N/ND v2
     BOARDNAME := TL-WA901ND-v2
     DEVICE_PROFILE := TLWA901
     TPLINK_HWID := 0x09010002
@@ -716,6 +836,7 @@ endef
 
 define Device/tl-wa901nd-v3
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WA901N/ND v3
     BOARDNAME := TL-WA901ND-v3
     DEVICE_PROFILE := TLWA901
     TPLINK_HWID := 0x09010003
@@ -723,6 +844,7 @@ endef
 
 define Device/tl-wa901nd-v4
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WA901N/ND v4
     BOARDNAME := TL-WA901ND-v4
     DEVICE_PROFILE := TLWA901
     TPLINK_HWID := 0x09010004
@@ -732,6 +854,8 @@ TARGET_DEVICES += tl-wa901nd-v1 tl-wa901nd-v2 tl-wa901nd-v3 tl-wa901nd-v4
 
 define Device/tl-wa7210n-v2
     $(Device/tplink-4mlzma)
+    DEVICE_TITLE := TP-LINK TL-WA7210N
+    DEVICE_PACKAGES := rssileds kmod-ledtrig-netdev
     BOARDNAME := TL-WA7210N-v2
     DEVICE_PROFILE := TLWA7210
     TPLINK_HWID := 0x72100002
diff --git a/target/linux/ar71xx/image/ubnt.mk b/target/linux/ar71xx/image/ubnt.mk
index 4589345d40..ab245df987 100644
--- a/target/linux/ar71xx/image/ubnt.mk
+++ b/target/linux/ar71xx/image/ubnt.mk
@@ -39,6 +39,7 @@ DEVICE_VARS += UBNT_BOARD UBNT_CHIP UBNT_TYPE
 # UBNT_TYPE e.g. one of (BZ, XM, XW)
 # UBNT_CHIP e.g. one of (ar7240, ar933x, ar934x)
 define Device/ubnt-xm
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2
   DEVICE_PROFILE := UBNT
   IMAGE_SIZE := 7552k
   MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7552k(firmware),256k(cfg)ro,64k(EEPROM)ro
@@ -51,6 +52,7 @@ define Device/ubnt-xm
 endef
 
 define Device/ubnt-xw
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2
   DEVICE_PROFILE := UBNT
   IMAGE_SIZE := 7552k
   MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7552k(firmware),256k(cfg)ro,64k(EEPROM)ro
@@ -63,6 +65,7 @@ define Device/ubnt-xw
 endef
 
 define Device/ubnt-bz
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2
   DEVICE_PROFILE := UBNT
   IMAGE_SIZE := 7552k
   MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7552k(firmware),256k(cfg)ro,64k(EEPROM)ro
@@ -75,6 +78,7 @@ define Device/ubnt-bz
 endef
 
 define Device/ubnt-unifiac
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2
   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
@@ -84,50 +88,61 @@ endef
 
 define Device/rw2458n
   $(Device/ubnt-xm)
+  DEVICE_TITLE := Ubiquiti RW2458N
   BOARDNAME := RW2458N
 endef
 
 define Device/ubnt-airrouter
   $(Device/ubnt-xm)
+  DEVICE_TITLE := Ubiquiti AirRouter
   BOARDNAME := UBNT-AR
 endef
 
 define Device/ubnt-bullet-m
   $(Device/ubnt-xm)
+  DEVICE_TITLE := Ubiquiti Bullet-M
   BOARDNAME := UBNT-BM
 endef
 
 define Device/ubnt-rocket-m
   $(Device/ubnt-xm)
+  DEVICE_TITLE := Ubiquiti Rocket-M
   BOARDNAME := UBNT-RM
 endef
 
 define Device/ubnt-nano-m
   $(Device/ubnt-xm)
+  DEVICE_TITLE := Ubiquiti Nano-M
   BOARDNAME := UBNT-NM
 endef
 TARGET_DEVICES += rw2458n ubnt-airrouter ubnt-bullet-m ubnt-rocket-m ubnt-nano-m
 
 define Device/ubnt-unifi
   $(Device/ubnt-bz)
+  DEVICE_TITLE := Ubiquiti UniFi
   BOARDNAME := UBNT-UF
   DEVICE_PROFILE := UBNT UBNTUNIFI
 endef
 
 define Device/ubnt-unifiac-lite
   $(Device/ubnt-unifiac)
+  DEVICE_TITLE := Ubiquiti UniFi AC-Lite
+  DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x
   DEVICE_PROFILE := UBNT UBNTUNIFIACLITE
   BOARDNAME := UBNT-UF-AC-LITE
 endef
 
 define Device/ubnt-unifiac-pro
   $(Device/ubnt-unifiac)
+  DEVICE_TITLE := Ubiquiti UniFi AC-Pro
+  DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x kmod-usb-core kmod-usb-ohci kmod-usb2
   DEVICE_PROFILE := UBNT UBNTUNIFIACPRO
   BOARDNAME := UBNT-UF-AC-PRO
 endef
 
 define Device/ubnt-unifi-outdoor
   $(Device/ubnt-bz)
+  DEVICE_TITLE := Ubiquiti UniFi Outdoor
   BOARDNAME := UBNT-U20
   DEVICE_PROFILE := UBNT UBNTUNIFIOUTDOOR
 endef
@@ -135,21 +150,25 @@ TARGET_DEVICES += ubnt-unifi ubnt-unifiac-lite ubnt-unifiac-pro ubnt-unifi-outdo
 
 define Device/ubnt-nano-m-xw
   $(Device/ubnt-xw)
+  DEVICE_TITLE := Ubiquiti Nano M XW
   BOARDNAME := UBNT-NM-XW
 endef
 
 define Device/ubnt-loco-m-xw
   $(Device/ubnt-xw)
+  DEVICE_TITLE := Ubiquiti Loco XW
   BOARDNAME := UBNT-LOCO-XW
 endef
 
 define Device/ubnt-rocket-m-xw
   $(Device/ubnt-xw)
+  DEVICE_TITLE := Ubiquiti Rocket M XW
   BOARDNAME := UBNT-RM-XW
 endef
 
 define Device/ubnt-rocket-m-ti
   $(Device/ubnt-xw)
+  DEVICE_TITLE := Ubiquiti Rocket M TI
   BOARDNAME := UBNT-RM-TI
   UBNT_TYPE := TI
   UBNT_BOARD := XM
@@ -158,6 +177,7 @@ TARGET_DEVICES += ubnt-nano-m-xw ubnt-loco-m-xw ubnt-rocket-m-xw ubnt-rocket-m-t
 
 define Device/ubnt-air-gateway
   $(Device/ubnt-xm)
+  DEVICE_TITLE := Ubiquiti Air Gateway
   BOARDNAME := UBNT-AGW
   UBNT_BOARD := XM
   UBNT_TYPE := AirGW
@@ -168,6 +188,7 @@ TARGET_DEVICES += ubnt-air-gateway
 
 define Device/ubnt-air-gateway-pro
   $(Device/ubnt-xm)
+  DEVICE_TITLE := Ubiquiti Air Gateway Pro
   BOARDNAME := UBNT-AGWP
   UBNT_TYPE := AirGWP
   UBNT_CHIP := ar934x
@@ -177,6 +198,7 @@ TARGET_DEVICES += ubnt-air-gateway-pro
 
 define Device/ubdev01
   $(Device/ubnt-xm)
+  DEVICE_TITLE := Ubiquiti ubDEV01
   MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7488k(firmware),64k(certs),256k(cfg)ro,64k(EEPROM)ro
   BOARDNAME := UBNT-UF
   UBNT_BOARD := UBDEV01
@@ -187,6 +209,8 @@ endef
 TARGET_DEVICES += ubdev01
 
 define Device/ubnt-routerstation
+  DEVICE_TITLE := Ubiquiti RouterStation
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2
   IMAGE_SIZE := 16128k
   IMAGES := sysupgrade.bin factory.bin
   IMAGE/factory.bin = append-rootfs | pad-rootfs | mkubntimage
@@ -196,6 +220,7 @@ endef
 
 define Device/ubnt-rs
 $(Device/ubnt-routerstation)
+  DEVICE_TITLE := Ubiquiti RouterStation
   BOARDNAME := UBNT-RS
   DEVICE_PROFILE := Madwifi UBNT UBNTRS
   UBNT_BOARD := RS
@@ -205,6 +230,7 @@ endef
 
 define Device/ubnt-rspro
 $(Device/ubnt-routerstation)
+  DEVICE_TITLE := Ubiquiti RouterStation Pro
   BOARDNAME := UBNT-RSPRO
   DEVICE_PROFILE := Madwifi UBNT UBNTRSPRO
   UBNT_BOARD := RSPRO
@@ -214,6 +240,7 @@ endef
 
 define Device/ubnt-ls-sr71
 $(Device/ubnt-routerstation)
+  DEVICE_TITLE := Ubiquiti LS-SR71
   BOARDNAME := UBNT-LS-SR71
   DEVICE_PROFILE := Madwifi UBNT
   UBNT_BOARD := LS-SR71
@@ -224,6 +251,7 @@ endef
 TARGET_DEVICES += ubnt-rs ubnt-rspro ubnt-ls-sr71
 
 define Device/ubnt-uap-pro
+  DEVICE_TITLE := Ubiquiti UAP Pro
   KERNEL_SIZE := 1536k
   IMAGE_SIZE := 15744k
   MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,1536k(kernel),14208k(rootfs),256k(cfg)ro,64k(EEPROM)ro,15744k@0x50000(firmware)
@@ -239,6 +267,7 @@ endef
 
 define Device/ubnt-unifi-outdoor-plus
 $(Device/ubnt-uap-pro)
+  DEVICE_TITLE := Ubiquiti UniFi Outdoor Pro
   UBNT_CHIP := ar7240
   BOARDNAME := UBNT-UOP
   DEVICE_PROFILE := UBNT