[OpenWrt-Devel,2/2] treewide: use wpad-basic for not small flash targets

Message ID 20181012152607.51628-3-ldir@darbyshire-bryant.me.uk
State Accepted
Headers show
Series
  • wpad basic variant
Related show

Commit Message

Kevin Darbyshire-Bryant Oct. 12, 2018, 3:26 p.m.
From: Mathias Kresin <dev@kresin.me>

Add out of the box support for 802.11r and 802.11w to all targets not
suffering from small flash.

Signed-off-by: Mathias Kresin <dev@kresin.me>
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
---
 .../linux/adm8668/profiles/100-WRTU54G-TM.mk  |  2 +-
 target/linux/apm821xx/image/Makefile          |  2 +-
 target/linux/apm821xx/nand/target.mk          |  2 +-
 .../apm821xx/sata/profiles/00-default.mk      |  2 +-
 target/linux/ar7/generic/target.mk            |  2 +-
 target/linux/ar71xx/Makefile                  |  2 +-
 target/linux/ar71xx/generic/target.mk         |  2 +
 target/linux/ar71xx/image/generic.mk          |  4 +-
 target/linux/ar71xx/mikrotik/target.mk        |  2 +-
 target/linux/ar71xx/nand/target.mk            |  2 +
 target/linux/ar71xx/tiny/target.mk            |  2 +
 .../arc770/generic/profiles/00-default.mk     |  2 +-
 .../archs38/generic/profiles/00-default.mk    |  2 +-
 target/linux/ath79/Makefile                   |  2 +-
 target/linux/ath79/generic/target.mk          |  2 +
 target/linux/ath79/nand/target.mk             |  2 +
 target/linux/ath79/tiny/target.mk             |  2 +
 target/linux/au1000/au1500/target.mk          |  2 -
 target/linux/au1000/au1550/target.mk          |  2 -
 target/linux/bcm53xx/image/Makefile           |  2 +-
 target/linux/brcm2708/image/Makefile          |  6 +-
 target/linux/brcm47xx/Makefile                |  2 +-
 .../generic/profiles/101-Broadcom-wl.mk       |  2 +-
 .../generic/profiles/105-Broadcom-none.mk     |  2 +-
 .../generic/profiles/201-Broadcom-b44-wl.mk   |  2 +-
 .../generic/profiles/205-Broadcom-b44-none.mk |  2 +-
 .../generic/profiles/211-Broadcom-tg3-wl.mk   |  2 +-
 .../generic/profiles/215-Broadcom-tg3-none.mk |  2 +-
 .../generic/profiles/221-Broadcom-bgmac-wl.mk |  2 +-
 .../profiles/225-Broadcom-bgmac-none.mk       |  2 +-
 .../brcm47xx/generic/profiles/PS-1208MFG.mk   |  2 +-
 target/linux/brcm47xx/generic/target.mk       |  2 +
 target/linux/brcm47xx/legacy/target.mk        |  2 +
 .../mips74k/profiles/102-Broadcom-wl.mk       |  2 +-
 .../mips74k/profiles/103-Broadcom-none.mk     |  2 +-
 target/linux/brcm47xx/mips74k/target.mk       |  2 +
 target/linux/brcm63xx/image/Makefile          | 10 +--
 target/linux/brcm63xx/profiles/default.mk     |  2 +-
 target/linux/cns3xxx/Makefile                 |  2 +-
 target/linux/ipq40xx/Makefile                 |  2 +-
 target/linux/ipq806x/Makefile                 |  2 +-
 .../ixp4xx/generic/profiles/200-NSLU2.mk      |  2 +-
 .../ixp4xx/generic/profiles/500-USR8200.mk    |  2 +-
 target/linux/ixp4xx/generic/target.mk         |  2 +-
 target/linux/kirkwood/image/Makefile          |  4 +-
 target/linux/kirkwood/profiles/00-default.mk  |  2 +-
 target/linux/lantiq/image/Makefile            | 66 +++++++++----------
 target/linux/lantiq/image/tp-link.mk          |  4 +-
 target/linux/malta/Makefile                   |  2 +-
 target/linux/mediatek/Makefile                |  2 +-
 target/linux/mpc85xx/Makefile                 |  2 +-
 target/linux/mpc85xx/image/Makefile           |  4 +-
 target/linux/mvebu/image/cortex-a9.mk         |  4 +-
 target/linux/mvebu/profiles/000-Default.mk    |  2 +-
 target/linux/omap/profiles/00-default.mk      |  2 +-
 target/linux/orion/Makefile                   |  2 +-
 target/linux/ramips/image/mt7621.mk           | 58 ++++++++--------
 target/linux/ramips/image/rt305x.mk           |  2 +-
 target/linux/ramips/mt7620/target.mk          |  2 +-
 target/linux/ramips/mt76x8/target.mk          |  2 +-
 target/linux/rb532/Makefile                   |  2 +-
 target/linux/sunxi/image/cortex-a7.mk         |  4 +-
 target/linux/sunxi/profiles/00-default.mk     |  2 +-
 target/linux/uml/Makefile                     |  2 +-
 target/linux/x86/geode/target.mk              |  2 +-
 65 files changed, 144 insertions(+), 130 deletions(-)

Comments

Jo-Philipp Wich Oct. 16, 2018, 11:02 a.m. | #1
Hi,
> From: Mathias Kresin <dev@kresin.me>
> 
> Add out of the box support for 802.11r and 802.11w to all targets not
> suffering from small flash.
> 
> Signed-off-by: Mathias Kresin <dev@kresin.me>
> Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>

Acked-by: Jo-Philipp Wich <jo@mein.io>

Patch

diff --git a/target/linux/adm8668/profiles/100-WRTU54G-TM.mk b/target/linux/adm8668/profiles/100-WRTU54G-TM.mk
index 3ff0307061..fa7c11495b 100644
--- a/target/linux/adm8668/profiles/100-WRTU54G-TM.mk
+++ b/target/linux/adm8668/profiles/100-WRTU54G-TM.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/WRTU54G-TM
   NAME:=Linksys WRTU54G T-Mobile (Default)
-  PACKAGES:=kmod-rt61-pci kmod-usb2 wpad-mini
+  PACKAGES:=kmod-rt61-pci kmod-usb2 wpad-basic
 endef
 
 define Profile/WRTU54G-TM/Description
diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile
index 00ab19602d..4a6ca9b633 100644
--- a/target/linux/apm821xx/image/Makefile
+++ b/target/linux/apm821xx/image/Makefile
@@ -216,7 +216,7 @@  endef
 
 define Device/wd_mybooklive
   DEVICE_TITLE := Western Digital My Book Live Series (Single + Duo)
-  DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-mini
+  DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-basic
   DEVICE_DTS := wd-mybooklive
   SUPPORTED_DEVICES += mbl wd_mybooklive-duo
   BLOCKSIZE := 1k
diff --git a/target/linux/apm821xx/nand/target.mk b/target/linux/apm821xx/nand/target.mk
index 2dce530cef..16475307d7 100644
--- a/target/linux/apm821xx/nand/target.mk
+++ b/target/linux/apm821xx/nand/target.mk
@@ -1,7 +1,7 @@ 
 BOARDNAME:=Devices with NAND flash (Routers)
 FEATURES += nand pcie ramdisk squashfs usb
 
-DEFAULT_PACKAGES += kmod-ath9k swconfig wpad-mini
+DEFAULT_PACKAGES += kmod-ath9k swconfig wpad-basic
 
 define Target/Description
 	Build firmware images for APM821XX boards with NAND flash.
diff --git a/target/linux/apm821xx/sata/profiles/00-default.mk b/target/linux/apm821xx/sata/profiles/00-default.mk
index 9ad2537a2c..db48353bf2 100644
--- a/target/linux/apm821xx/sata/profiles/00-default.mk
+++ b/target/linux/apm821xx/sata/profiles/00-default.mk
@@ -8,7 +8,7 @@ 
 define Profile/Default
   NAME:=Default Profile
   PRIORITY:=1
-  PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-mini
+  PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-basic
 endef
 
 define Profile/Default/Description
diff --git a/target/linux/ar7/generic/target.mk b/target/linux/ar7/generic/target.mk
index 8b5350e469..b40d2a4722 100644
--- a/target/linux/ar7/generic/target.mk
+++ b/target/linux/ar7/generic/target.mk
@@ -5,7 +5,7 @@ 
 SUBTARGET:=generic
 BOARDNAME:=Texas Instruments AR7 boards
 
-DEFAULT_PACKAGES+= kmod-mac80211 kmod-acx-mac80211 wpad-mini
+DEFAULT_PACKAGES+= kmod-mac80211 kmod-acx-mac80211 wpad-basic
 
 define Target/Description
 	Build firmware images for TI AR7 based routers.
diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile
index 71fe02f326..047d34184e 100644
--- a/target/linux/ar71xx/Makefile
+++ b/target/linux/ar71xx/Makefile
@@ -19,6 +19,6 @@  include $(INCLUDE_DIR)/target.mk
 
 DEFAULT_PACKAGES += \
 	kmod-gpio-button-hotplug swconfig \
-	kmod-ath9k wpad-mini uboot-envtools
+	kmod-ath9k uboot-envtools
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/ar71xx/generic/target.mk b/target/linux/ar71xx/generic/target.mk
index 64eb205e4d..0a26110d27 100644
--- a/target/linux/ar71xx/generic/target.mk
+++ b/target/linux/ar71xx/generic/target.mk
@@ -1,6 +1,8 @@ 
 BOARDNAME:=Generic
 FEATURES += squashfs
 
+DEFAULT_PACKAGES += wpad-basic
+
 define Target/Description
 	Build firmware images for generic Atheros AR71xx/AR913x/AR934x based boards.
 endef
diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk
index a0d5780461..9834e199ae 100644
--- a/target/linux/ar71xx/image/generic.mk
+++ b/target/linux/ar71xx/image/generic.mk
@@ -560,7 +560,7 @@  define Device/lan-turtle
   $(Device/tplink-16mlzma)
   DEVICE_TITLE := Hak5 LAN Turtle
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage \
-	-kmod-ath9k -swconfig -uboot-envtools -wpad-mini
+	-kmod-ath9k -swconfig -uboot-envtools -wpad-basic
   BOARDNAME := LAN-TURTLE
   DEVICE_PROFILE := LANTURTLE
   TPLINK_HWID := 0x5348334c
@@ -717,7 +717,7 @@  define Device/packet-squirrel
   $(Device/tplink-16mlzma)
   DEVICE_TITLE := Hak5 Packet Squirrel
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 \
-	-kmod-ath9k -swconfig -uboot-envtools -wpad-mini
+	-kmod-ath9k -swconfig -uboot-envtools -wpad-basic
   BOARDNAME := PACKET-SQUIRREL
   DEVICE_PROFILE := PACKETSQUIRREL
   TPLINK_HWID := 0x5351524c
diff --git a/target/linux/ar71xx/mikrotik/target.mk b/target/linux/ar71xx/mikrotik/target.mk
index ff2bbbffe7..5ae57fadb3 100644
--- a/target/linux/ar71xx/mikrotik/target.mk
+++ b/target/linux/ar71xx/mikrotik/target.mk
@@ -1,7 +1,7 @@ 
 BOARDNAME:=Mikrotik devices with NAND/NOR flash
 FEATURES += squashfs ramdisk minor nand
 
-DEFAULT_PACKAGES += nand-utils
+DEFAULT_PACKAGES += nand-utils wpad-basic
 
 define Target/Description
 	Build firmware images for Atheros AR71xx/AR913x based Mikrotik boards.
diff --git a/target/linux/ar71xx/nand/target.mk b/target/linux/ar71xx/nand/target.mk
index 7532ec6958..d5191b2260 100644
--- a/target/linux/ar71xx/nand/target.mk
+++ b/target/linux/ar71xx/nand/target.mk
@@ -1,6 +1,8 @@ 
 BOARDNAME := Generic devices with NAND flash
 FEATURES += squashfs nand rtc
 
+DEFAULT_PACKAGES += wpad-basic
+
 define Target/Description
 	Build firmware images for Atheros AR71xx/AR913x based boards with
 	NAND flash, e.g. Netgear WNDR4300.
diff --git a/target/linux/ar71xx/tiny/target.mk b/target/linux/ar71xx/tiny/target.mk
index 1742eb508f..89d4447e1e 100644
--- a/target/linux/ar71xx/tiny/target.mk
+++ b/target/linux/ar71xx/tiny/target.mk
@@ -1,6 +1,8 @@ 
 BOARDNAME:=Devices with small flash
 FEATURES += squashfs small_flash
 
+DEFAULT_PACKAGES += wpad-mini
+
 define Target/Description
 	Build firmware images for Atheros AR71xx/AR913x/AR934x based boards with small NOR flash.
 endef
diff --git a/target/linux/arc770/generic/profiles/00-default.mk b/target/linux/arc770/generic/profiles/00-default.mk
index d97bc0f41f..798478b616 100644
--- a/target/linux/arc770/generic/profiles/00-default.mk
+++ b/target/linux/arc770/generic/profiles/00-default.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/Default
 	NAME:=Default Profile (all drivers)
-	PACKAGES:= kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ath9k-htc wpad-mini
+	PACKAGES:= kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ath9k-htc wpad-basic
 endef
 
 define Profile/Default/Description
diff --git a/target/linux/archs38/generic/profiles/00-default.mk b/target/linux/archs38/generic/profiles/00-default.mk
index b27b5a4dfa..747967df94 100644
--- a/target/linux/archs38/generic/profiles/00-default.mk
+++ b/target/linux/archs38/generic/profiles/00-default.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/Default
 	NAME:=Default Profile (all drivers)
-	PACKAGES:= kmod-usb-core kmod-usb2 kmod-ath9k-htc wpad-mini
+	PACKAGES:= kmod-usb-core kmod-usb2 kmod-ath9k-htc wpad-basic
 endef
 
 define Profile/Default/Description
diff --git a/target/linux/ath79/Makefile b/target/linux/ath79/Makefile
index 2d8ca7efdb..a0dc96ca09 100644
--- a/target/linux/ath79/Makefile
+++ b/target/linux/ath79/Makefile
@@ -14,6 +14,6 @@  include $(INCLUDE_DIR)/target.mk
 
 DEFAULT_PACKAGES += \
 	kmod-gpio-button-hotplug swconfig \
-	kmod-ath9k wpad-mini uboot-envtools
+	kmod-ath9k uboot-envtools
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/ath79/generic/target.mk b/target/linux/ath79/generic/target.mk
index 64eb205e4d..0a26110d27 100644
--- a/target/linux/ath79/generic/target.mk
+++ b/target/linux/ath79/generic/target.mk
@@ -1,6 +1,8 @@ 
 BOARDNAME:=Generic
 FEATURES += squashfs
 
+DEFAULT_PACKAGES += wpad-basic
+
 define Target/Description
 	Build firmware images for generic Atheros AR71xx/AR913x/AR934x based boards.
 endef
diff --git a/target/linux/ath79/nand/target.mk b/target/linux/ath79/nand/target.mk
index a53603d27b..91afe675c5 100644
--- a/target/linux/ath79/nand/target.mk
+++ b/target/linux/ath79/nand/target.mk
@@ -1,6 +1,8 @@ 
 BOARDNAME := Generic devices with NAND flash
 FEATURES += squashfs nand rtc
 
+DEFAULT_PACKAGES += wpad-basic
+
 define Target/Description
 	Build firmware for Atheros AR71xx/AR913x based boards with
 	NAND flash, e.g. Netgear WNDR4300.
diff --git a/target/linux/ath79/tiny/target.mk b/target/linux/ath79/tiny/target.mk
index 87af3ef2bf..dba57e5965 100644
--- a/target/linux/ath79/tiny/target.mk
+++ b/target/linux/ath79/tiny/target.mk
@@ -1,6 +1,8 @@ 
 BOARDNAME:=Devices with small flash
 FEATURES += squashfs small_flash
 
+DEFAULT_PACKAGES += wpad-mini
+
 define Target/Description
 	Build firmware images for Atheros AR71xx/AR913x/AR934x based boards with small flash
 endef
diff --git a/target/linux/au1000/au1500/target.mk b/target/linux/au1000/au1500/target.mk
index 240914ff71..3e9c5955ff 100644
--- a/target/linux/au1000/au1500/target.mk
+++ b/target/linux/au1000/au1500/target.mk
@@ -1,7 +1,5 @@ 
 BOARDNAME:=Au1500
 
-DEFAULT_PACKAGES+= wpad-mini
-
 define Target/Description
         Build firmware images for Au1500 based boards
 endef
diff --git a/target/linux/au1000/au1550/target.mk b/target/linux/au1000/au1550/target.mk
index 1429cb403f..9ed4468f30 100644
--- a/target/linux/au1000/au1550/target.mk
+++ b/target/linux/au1000/au1550/target.mk
@@ -1,8 +1,6 @@ 
 BOARDNAME:=Au1550
 FEATURES += pcmcia
 
-DEFAULT_PACKAGES+= wpad-mini
-
 define Target/Description
         Build firmware images for Au1550 based boards
 endef
diff --git a/target/linux/bcm53xx/image/Makefile b/target/linux/bcm53xx/image/Makefile
index e42d612f1f..83d1ccfda6 100644
--- a/target/linux/bcm53xx/image/Makefile
+++ b/target/linux/bcm53xx/image/Makefile
@@ -103,7 +103,7 @@  endef
 DEVICE_VARS += PRODUCTID SIGNATURE NETGEAR_BOARD_ID NETGEAR_REGION TPLINK_BOARD
 DEVICE_VARS += BUFFALO_TAG_PLATFORM BUFFALO_TAG_VERSION BUFFALO_TAG_MINOR
 
-IEEE8021X := wpad-mini
+IEEE8021X := wpad-basic
 B43 := $(IEEE8021X) kmod-b43
 BRCMFMAC_43602A1 := $(IEEE8021X) kmod-brcmfmac brcmfmac-firmware-43602a1-pcie
 BRCMFMAC_4366B1 := $(IEEE8021X) kmod-brcmfmac brcmfmac-firmware-4366b1-pcie
diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile
index aedea94451..3272a2cf5a 100644
--- a/target/linux/brcm2708/image/Makefile
+++ b/target/linux/brcm2708/image/Makefile
@@ -58,7 +58,7 @@  define Device/rpi
   DEVICE_TITLE := Raspberry Pi B/B+/CM/Zero/ZeroW
   DEVICE_DTS := bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm bcm2708-rpi-0-w
   SUPPORTED_DEVICES := rpi-b rpi-b-plus rpi-cm rpi-zero rpi-zero-w raspberrypi,model-b raspberrypi,model-b-plus raspberrypi,compute-module-1 raspberrypi,model-b-rev2 raspberrypi,model-zero raspberrypi,model-zero-w
-  DEVICE_PACKAGES := brcmfmac-firmware-43430-sdio brcmfmac-board-rpi2 kmod-brcmfmac wpad-mini
+  DEVICE_PACKAGES := brcmfmac-firmware-43430-sdio brcmfmac-board-rpi2 kmod-brcmfmac wpad-basic
 endef
 ifeq ($(SUBTARGET),bcm2708)
   TARGET_DEVICES += rpi
@@ -68,7 +68,7 @@  define Device/rpi-2
   DEVICE_TITLE := Raspberry Pi 2B/3B/3B+/3CM
   DEVICE_DTS := bcm2709-rpi-2-b bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3
   SUPPORTED_DEVICES := rpi-2-b rpi-3-b rpi-3-b-plus rpi-cm raspberrypi,2-model-b raspberrypi,3-model-b raspberrypi,3-model-b-plus raspberrypi,compute-module-3
-  DEVICE_PACKAGES := brcmfmac-firmware-43430-sdio brcmfmac-firmware-43455-sdio brcmfmac-board-rpi2 brcmfmac-board-rpi3 kmod-brcmfmac wpad-mini
+  DEVICE_PACKAGES := brcmfmac-firmware-43430-sdio brcmfmac-firmware-43455-sdio brcmfmac-board-rpi2 brcmfmac-board-rpi3 kmod-brcmfmac wpad-basic
 endef
 ifeq ($(SUBTARGET),bcm2709)
   TARGET_DEVICES += rpi-2
@@ -79,7 +79,7 @@  define Device/rpi-3
   DEVICE_TITLE := Raspberry Pi 3B/3B+
   DEVICE_DTS := broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus
   SUPPORTED_DEVICES := rpi-3-b rpi-3-b-plus raspberrypi,3-model-b raspberrypi,3-model-b-plus
-  DEVICE_PACKAGES := brcmfmac-firmware-43430-sdio brcmfmac-board-rpi2 brcmfmac-firmware-43455-sdio brcmfmac-board-rpi3 kmod-brcmfmac wpad-mini
+  DEVICE_PACKAGES := brcmfmac-firmware-43430-sdio brcmfmac-board-rpi2 brcmfmac-firmware-43455-sdio brcmfmac-board-rpi3 kmod-brcmfmac wpad-basic
 endef
 ifeq ($(SUBTARGET),bcm2710)
   TARGET_DEVICES += rpi-3
diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile
index 484f314bc1..af91d8bada 100644
--- a/target/linux/brcm47xx/Makefile
+++ b/target/linux/brcm47xx/Makefile
@@ -21,7 +21,7 @@  endef
 
 include $(INCLUDE_DIR)/target.mk
 
-DEFAULT_PACKAGES += swconfig wpad-mini nvram otrx \
+DEFAULT_PACKAGES += swconfig nvram otrx \
 	kmod-leds-gpio kmod-gpio-button-hotplug \
 	kmod-ledtrig-default-on kmod-ledtrig-timer kmod-ledtrig-netdev
 
diff --git a/target/linux/brcm47xx/generic/profiles/101-Broadcom-wl.mk b/target/linux/brcm47xx/generic/profiles/101-Broadcom-wl.mk
index 21265daff8..c3e9d20c13 100644
--- a/target/linux/brcm47xx/generic/profiles/101-Broadcom-wl.mk
+++ b/target/linux/brcm47xx/generic/profiles/101-Broadcom-wl.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/Broadcom-wl
   NAME:=Broadcom SoC, all Ethernet, BCM43xx WiFi (wl, proprietary)
-  PACKAGES:=-wpad-mini kmod-b44 kmod-tg3 kmod-bgmac kmod-brcm-wl wlc nas
+  PACKAGES:=-wpad-basic kmod-b44 kmod-tg3 kmod-bgmac kmod-brcm-wl wlc nas
 endef
 
 define Profile/Broadcom-wl/Description
diff --git a/target/linux/brcm47xx/generic/profiles/105-Broadcom-none.mk b/target/linux/brcm47xx/generic/profiles/105-Broadcom-none.mk
index 301d02aebb..4497124a2e 100644
--- a/target/linux/brcm47xx/generic/profiles/105-Broadcom-none.mk
+++ b/target/linux/brcm47xx/generic/profiles/105-Broadcom-none.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/Broadcom-none
   NAME:=Broadcom SoC, all Ethernet, No WiFi
-  PACKAGES:=-wpad-mini kmod-b44 kmod-tg3 kmod-bgmac
+  PACKAGES:=-wpad-basic kmod-b44 kmod-tg3 kmod-bgmac
 endef
 
 define Profile/Broadcom-none/Description
diff --git a/target/linux/brcm47xx/generic/profiles/201-Broadcom-b44-wl.mk b/target/linux/brcm47xx/generic/profiles/201-Broadcom-b44-wl.mk
index f974c00e45..79b7c5c000 100644
--- a/target/linux/brcm47xx/generic/profiles/201-Broadcom-b44-wl.mk
+++ b/target/linux/brcm47xx/generic/profiles/201-Broadcom-b44-wl.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/Broadcom-b44-wl
   NAME:=Broadcom SoC, b44 Ethernet, BCM43xx WiFi (wl, proprietary)
-  PACKAGES:=-wpad-mini kmod-b44 kmod-brcm-wl wlc nas
+  PACKAGES:=-wpad-basic kmod-b44 kmod-brcm-wl wlc nas
 endef
 
 define Profile/Broadcom-b44-wl/Description
diff --git a/target/linux/brcm47xx/generic/profiles/205-Broadcom-b44-none.mk b/target/linux/brcm47xx/generic/profiles/205-Broadcom-b44-none.mk
index a936bba203..0854b5041e 100644
--- a/target/linux/brcm47xx/generic/profiles/205-Broadcom-b44-none.mk
+++ b/target/linux/brcm47xx/generic/profiles/205-Broadcom-b44-none.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/Broadcom-b44-none
   NAME:=Broadcom SoC, b44 Ethernet, No WiFi
-  PACKAGES:=-wpad-mini kmod-b44
+  PACKAGES:=-wpad-basic kmod-b44
 endef
 
 define Profile/Broadcom-b44-none/Description
diff --git a/target/linux/brcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk b/target/linux/brcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk
index 24ac234fff..6946668c91 100644
--- a/target/linux/brcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk
+++ b/target/linux/brcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/Broadcom-tg3-wl
   NAME:=Broadcom SoC, tg3 Ethernet, BCM43xx WiFi (wl, proprietary)
-  PACKAGES:=-wpad-mini kmod-brcm-wl wlc nas kmod-tg3
+  PACKAGES:=-wpad-basic kmod-brcm-wl wlc nas kmod-tg3
 endef
 
 define Profile/Broadcom-tg3-wl/Description
diff --git a/target/linux/brcm47xx/generic/profiles/215-Broadcom-tg3-none.mk b/target/linux/brcm47xx/generic/profiles/215-Broadcom-tg3-none.mk
index 2d13ca80c4..a5a3b4a010 100644
--- a/target/linux/brcm47xx/generic/profiles/215-Broadcom-tg3-none.mk
+++ b/target/linux/brcm47xx/generic/profiles/215-Broadcom-tg3-none.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/Broadcom-tg3-none
   NAME:=Broadcom SoC, tg3 Ethernet, no WiFi
-  PACKAGES:=-wpad-mini kmod-tg3
+  PACKAGES:=-wpad-basic kmod-tg3
 endef
 
 define Profile/Broadcom-tg3-none/Description
diff --git a/target/linux/brcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk b/target/linux/brcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk
index f671cd9599..acdc20fb70 100644
--- a/target/linux/brcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk
+++ b/target/linux/brcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/Broadcom-bgmac-wl
   NAME:=Broadcom SoC, bgmac Ethernet, BCM43xx WiFi (wl, proprietary)
-  PACKAGES:=-wpad-mini kmod-bgmac kmod-brcm-wl wlc nas
+  PACKAGES:=-wpad-basic kmod-bgmac kmod-brcm-wl wlc nas
 endef
 
 define Profile/Broadcom-bgmac-wl/Description
diff --git a/target/linux/brcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk b/target/linux/brcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk
index 0512119304..db2d1a264c 100644
--- a/target/linux/brcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk
+++ b/target/linux/brcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/Broadcom-bgmac-none
   NAME:=Broadcom SoC, bgmac Ethernet, No WiFi
-  PACKAGES:=-wpad-mini kmod-bgmac
+  PACKAGES:=-wpad-basic kmod-bgmac
 endef
 
 define Profile/Broadcom-bgmac-none/Description
diff --git a/target/linux/brcm47xx/generic/profiles/PS-1208MFG.mk b/target/linux/brcm47xx/generic/profiles/PS-1208MFG.mk
index e68c9a21fc..14ee46f200 100644
--- a/target/linux/brcm47xx/generic/profiles/PS-1208MFG.mk
+++ b/target/linux/brcm47xx/generic/profiles/PS-1208MFG.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/Ps1208mfg
   NAME:=Edimax PS-1208MFG
-  PACKAGES:=-firewall -dropbear -dnsmasq -mtd -ppp -wpad-mini kmod-b44 block-mount kmod-usb-storage kmod-usb2 kmod-usb-ohci -iptables -swconfig kmod-fs-ext4
+  PACKAGES:=-firewall -dropbear -dnsmasq -mtd -ppp -wpad-basic kmod-b44 block-mount kmod-usb-storage kmod-usb2 kmod-usb-ohci -iptables -swconfig kmod-fs-ext4
 endef
 
 define Profile/Ps1208mfg/Description
diff --git a/target/linux/brcm47xx/generic/target.mk b/target/linux/brcm47xx/generic/target.mk
index 71fde52bc3..2f93778b09 100644
--- a/target/linux/brcm47xx/generic/target.mk
+++ b/target/linux/brcm47xx/generic/target.mk
@@ -1,6 +1,8 @@ 
 BOARDNAME:=Generic
 FEATURES+=pcmcia
 
+DEFAULT_PACKAGES += wpad-basic
+
 define Target/Description
 	Build generic firmware for all Broadcom BCM47xx and BCM53xx MIPS
 	devices. It runs on both architectures BMIPS3300 and MIPS 74K.
diff --git a/target/linux/brcm47xx/legacy/target.mk b/target/linux/brcm47xx/legacy/target.mk
index aa0e3ed5ad..fca6128558 100644
--- a/target/linux/brcm47xx/legacy/target.mk
+++ b/target/linux/brcm47xx/legacy/target.mk
@@ -1,6 +1,8 @@ 
 FEATURES += low_mem pcmcia small_flash
 BOARDNAME:=Legacy (BMIPS3300)
 
+DEFAULT_PACKAGES += wpad-mini
+
 define Target/Description
 	Build firmware for Broadcom BCM47xx and BCM53xx devices with
 	BMIPS3300 CPU except for BCM4705 SoC.
diff --git a/target/linux/brcm47xx/mips74k/profiles/102-Broadcom-wl.mk b/target/linux/brcm47xx/mips74k/profiles/102-Broadcom-wl.mk
index 502fff462d..66b13bf879 100644
--- a/target/linux/brcm47xx/mips74k/profiles/102-Broadcom-wl.mk
+++ b/target/linux/brcm47xx/mips74k/profiles/102-Broadcom-wl.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/Broadcom-mips74k-wl
   NAME:=Broadcom SoC, BCM43xx WiFi (proprietary wl)
-  PACKAGES:=-wpad-mini kmod-brcm-wl wlc nas
+  PACKAGES:=-wpad-basic kmod-brcm-wl wlc nas
 endef
 
 define Profile/Broadcom-mips74k-wl/Description
diff --git a/target/linux/brcm47xx/mips74k/profiles/103-Broadcom-none.mk b/target/linux/brcm47xx/mips74k/profiles/103-Broadcom-none.mk
index 5790527780..cc4668de52 100644
--- a/target/linux/brcm47xx/mips74k/profiles/103-Broadcom-none.mk
+++ b/target/linux/brcm47xx/mips74k/profiles/103-Broadcom-none.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/Broadcom-mips74k-none
   NAME:=Broadcom SoC, No WiFi
-  PACKAGES:=-wpad-mini
+  PACKAGES:=-wpad-basic
 endef
 
 define Profile/Broadcom-mips74k-none/Description
diff --git a/target/linux/brcm47xx/mips74k/target.mk b/target/linux/brcm47xx/mips74k/target.mk
index e5c2565258..1e2e8436d5 100644
--- a/target/linux/brcm47xx/mips74k/target.mk
+++ b/target/linux/brcm47xx/mips74k/target.mk
@@ -1,6 +1,8 @@ 
 BOARDNAME:=MIPS 74K
 CPU_TYPE:=74kc
 
+DEFAULT_PACKAGES += wpad-basic
+
 define Target/Description
 	Build firmware for Broadcom BCM47xx and BCM53xx devices with
 	MIPS 74K CPU.
diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index c9363dda0a..21fc69e24e 100644
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -168,12 +168,12 @@  define Device/Default
   DEVICE_DTS_DIR := ../dts
 endef
 
-ATH5K_PACKAGES := kmod-ath5k wpad-mini
-ATH9K_PACKAGES := kmod-ath9k wpad-mini
-B43_PACKAGES := kmod-b43 wpad-mini
+ATH5K_PACKAGES := kmod-ath5k wpad-basic
+ATH9K_PACKAGES := kmod-ath9k wpad-basic
+B43_PACKAGES := kmod-b43 wpad-basic
 BRCMWL_PACKAGES := kmod-brcm-wl nas wlc
-RT28_PACKAGES := kmod-rt2800-pci wpad-mini
-RT61_PACKAGES := kmod-rt61-pci wpad-mini
+RT28_PACKAGES := kmod-rt2800-pci wpad-basic
+RT61_PACKAGES := kmod-rt61-pci wpad-basic
 USB1_PACKAGES := kmod-usb-ohci kmod-usb-ledtrig-usbport
 USB2_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
 
diff --git a/target/linux/brcm63xx/profiles/default.mk b/target/linux/brcm63xx/profiles/default.mk
index 3300929462..95cd67c46e 100644
--- a/target/linux/brcm63xx/profiles/default.mk
+++ b/target/linux/brcm63xx/profiles/default.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/Default
   NAME:=Default Profile
-  PACKAGES:=kmod-b43 wpad-mini
+  PACKAGES:=kmod-b43 wpad-basic
   PRIORITY:=1
 endef
 
diff --git a/target/linux/cns3xxx/Makefile b/target/linux/cns3xxx/Makefile
index 2a09ece67a..abb1fccf32 100644
--- a/target/linux/cns3xxx/Makefile
+++ b/target/linux/cns3xxx/Makefile
@@ -25,6 +25,6 @@  include $(INCLUDE_DIR)/target.mk
 
 KERNELNAME:=zImage
 
-DEFAULT_PACKAGES += kmod-ath9k kmod-usb2 wpad-mini
+DEFAULT_PACKAGES += kmod-ath9k kmod-usb2 wpad-basic
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/ipq40xx/Makefile b/target/linux/ipq40xx/Makefile
index 7d3b857eb4..906d022170 100644
--- a/target/linux/ipq40xx/Makefile
+++ b/target/linux/ipq40xx/Makefile
@@ -15,7 +15,7 @@  KERNELNAME:=zImage Image dtbs
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += \
 	kmod-leds-gpio kmod-gpio-button-hotplug swconfig \
-	kmod-ath10k-ct wpad-mini \
+	kmod-ath10k-ct wpad-basic \
 	kmod-usb3 kmod-usb-dwc3-of-simple kmod-usb-phy-qcom-dwc3 \
 	ath10k-firmware-qca4019-ct
 
diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile
index 178bf97915..129ea2cda5 100644
--- a/target/linux/ipq806x/Makefile
+++ b/target/linux/ipq806x/Makefile
@@ -20,7 +20,7 @@  DEFAULT_PACKAGES += \
 	kmod-ata-core kmod-ata-ahci kmod-ata-ahci-platform \
 	kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \
 	kmod-usb3 kmod-usb-dwc3-of-simple kmod-usb-phy-qcom-dwc3 \
-	kmod-ath10k-ct wpad-mini \
+	kmod-ath10k-ct wpad-basic \
 	uboot-envtools
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/ixp4xx/generic/profiles/200-NSLU2.mk b/target/linux/ixp4xx/generic/profiles/200-NSLU2.mk
index 93febb0d37..6a54f74bf3 100644
--- a/target/linux/ixp4xx/generic/profiles/200-NSLU2.mk
+++ b/target/linux/ixp4xx/generic/profiles/200-NSLU2.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/NSLU2
   NAME:=Linksys NSLU2
-  PACKAGES:=-wpad-mini -kmod-ath5k kmod-scsi-core \
+  PACKAGES:=-wpad-basic -kmod-ath5k kmod-scsi-core \
 	kmod-usb-core kmod-usb-ohci-pci kmod-usb2-pci kmod-usb-storage \
 	kmod-fs-ext4
 endef
diff --git a/target/linux/ixp4xx/generic/profiles/500-USR8200.mk b/target/linux/ixp4xx/generic/profiles/500-USR8200.mk
index 02ee0593c1..959c399e92 100644
--- a/target/linux/ixp4xx/generic/profiles/500-USR8200.mk
+++ b/target/linux/ixp4xx/generic/profiles/500-USR8200.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/USR8200
   NAME:=USRobotics USR8200
-  PACKAGES:=-wpad-mini kmod-scsi-core \
+  PACKAGES:=-wpad-basic kmod-scsi-core \
 	kmod-usb-core kmod-usb-uhci kmod-usb2-pci kmod-usb-storage \
 	kmod-fs-ext4 kmod-firewire kmod-firewire-ohci kmod-firewire-sbp2
 endef
diff --git a/target/linux/ixp4xx/generic/target.mk b/target/linux/ixp4xx/generic/target.mk
index f03e2a8586..4794755fdc 100644
--- a/target/linux/ixp4xx/generic/target.mk
+++ b/target/linux/ixp4xx/generic/target.mk
@@ -1,6 +1,6 @@ 
 BOARDNAME:=Generic
 
-DEFAULT_PACKAGES+= wpad-mini
+DEFAULT_PACKAGES+= wpad-basic
 
 define Target/Description
 	Build firmware images for ixp4xx based boards that boot from internal flash
diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile
index 84e749f494..0672ba0374 100644
--- a/target/linux/kirkwood/image/Makefile
+++ b/target/linux/kirkwood/image/Makefile
@@ -80,7 +80,7 @@  TARGET_DEVICES += iom_ix2_200
 
 define Device/linksys_audi
   DEVICE_TITLE := Linksys EA3500 (Audi)
-  DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-mini kmod-gpio-button-hotplug
+  DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-basic kmod-gpio-button-hotplug
   DEVICE_DTS := kirkwood-linksys-audi
   KERNEL_SIZE := 2624k
   KERNEL_IN_UBI := 0
@@ -93,7 +93,7 @@  TARGET_DEVICES += linksys_audi
 
 define Device/linksys_viper
   DEVICE_TITLE := Linksys E4200v2 / EA4500 (Viper)
-  DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-mini kmod-gpio-button-hotplug
+  DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-basic kmod-gpio-button-hotplug
   DEVICE_DTS := kirkwood-linksys-viper
   KERNEL_SIZE := 2688k
   KERNEL_IN_UBI := 0
diff --git a/target/linux/kirkwood/profiles/00-default.mk b/target/linux/kirkwood/profiles/00-default.mk
index ab2658c9b4..002751714e 100644
--- a/target/linux/kirkwood/profiles/00-default.mk
+++ b/target/linux/kirkwood/profiles/00-default.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/Default
 	NAME:=Default Profile
-	PACKAGES:=kmod-mwl8k swconfig wpad-mini
+	PACKAGES:=kmod-mwl8k swconfig wpad-basic
 	PRIORITY:=1
 endef
 
diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile
index 44cfc57e79..e9d9e42027 100644
--- a/target/linux/lantiq/image/Makefile
+++ b/target/linux/lantiq/image/Makefile
@@ -192,7 +192,7 @@  define Device/arcadyan_arv4518pwr01a
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
 	ltq-adsl-app ppp-mod-pppoa \
-	kmod-ath5k wpad-mini
+	kmod-ath5k wpad-basic
   SUPPORTED_DEVICES += ARV4518PWR01A
 endef
 TARGET_DEVICES += arcadyan_arv4518pwr01a
@@ -213,7 +213,7 @@  define Device/bt_homehub-v2b
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
 	kmod-ltq-deu-danube \
 	ltq-adsl-app ppp-mod-pppoa \
-	kmod-ath9k kmod-owl-loader wpad-mini
+	kmod-ath9k kmod-owl-loader wpad-basic
   SUPPORTED_DEVICES += BTHOMEHUBV2B
 endef
 TARGET_DEVICES += bt_homehub-v2b
@@ -235,7 +235,7 @@  define Device/audiocodes_mp-252
 	kmod-usb-ledtrig-usbport kmod-usb-dwc2 \
 	kmod-rt2800-pci \
 	ltq-adsl-app ppp-mod-pppoa \
-	wpad-mini
+	wpad-basic
   SUPPORTED_DEVICES += ACMP252
 endef
 TARGET_DEVICES += audiocodes_mp-252
@@ -249,7 +249,7 @@  define Device/arcadyan_arv4510pw
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
 	ltq-adsl-app ppp-mod-pppoa \
 	kmod-ltq-tapi kmod-ltq-vmmc \
-	kmod-rt2800-pci kmod-ath5k wpad-mini
+	kmod-rt2800-pci kmod-ath5k wpad-basic
   SUPPORTED_DEVICES += ARV4510PW
 endef
 TARGET_DEVICES += arcadyan_arv4510pw
@@ -258,7 +258,7 @@  define Device/arcadyan_arv7525pw
   IMAGE_SIZE := 3776k
   DEVICE_DTS := ARV4510PW
   DEVICE_TITLE := Speedport W303V Typ A - ARV7525PW
-  DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini \
+  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
 	ltq-adsl-app ppp-mod-pppoa -swconfig
@@ -285,7 +285,7 @@  define Device/arcadyan_arv7506pw11
   DEVICE_PACKAGES := kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
 	ltq-adsl-app ppp-mod-pppoa \
-	kmod-rt2800-pci wpad-mini
+	kmod-rt2800-pci wpad-basic
   SUPPORTED_DEVICES += ARV7506PW11
 endef
 TARGET_DEVICES += arcadyan_arv7506pw11
@@ -299,7 +299,7 @@  define Device/arcadyan_arv7510pw22
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
 	ltq-adsl-app ppp-mod-pppoa \
 	kmod-ltq-tapi kmod-ltq-vmmc \
-	kmod-rt2800-pci wpad-mini \
+	kmod-rt2800-pci wpad-basic \
 	kmod-usb-uhci kmod-usb2 kmod-usb2-pci
   SUPPORTED_DEVICES += ARV7510PW22
 endef
@@ -313,7 +313,7 @@  define Device/arcadyan_arv7518pw
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
 	ltq-adsl-app ppp-mod-pppoa \
-	kmod-ath9k kmod-owl-loader wpad-mini
+	kmod-ath9k kmod-owl-loader wpad-basic
   SUPPORTED_DEVICES += ARV7518PW
 endef
 TARGET_DEVICES += arcadyan_arv7518pw
@@ -326,7 +326,7 @@  define Device/arcadyan_arv7519pw
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
 	ltq-adsl-app ppp-mod-pppoa \
-	kmod-rt2800-pci wpad-mini
+	kmod-rt2800-pci wpad-basic
   SUPPORTED_DEVICES += ARV7519PW
 endef
 TARGET_DEVICES += arcadyan_arv7519pw
@@ -340,7 +340,7 @@  define Device/arcadyan_arv752dpw
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
 	ltq-adsl-app ppp-mod-pppoa \
 	kmod-ltq-tapi kmod-ltq-vmmc \
-	kmod-rt2800-pci wpad-mini
+	kmod-rt2800-pci wpad-basic
   SUPPORTED_DEVICES += ARV752DPW
 endef
 TARGET_DEVICES += arcadyan_arv752dpw
@@ -354,7 +354,7 @@  define Device/arcadyan_arv752dpw22
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
 	ltq-adsl-app ppp-mod-pppoa \
 	kmod-ltq-tapi kmod-ltq-vmmc \
-	kmod-rt2800-pci wpad-mini
+	kmod-rt2800-pci wpad-basic
   SUPPORTED_DEVICES += ARV752DPW22
 endef
 TARGET_DEVICES += arcadyan_arv752dpw22
@@ -367,7 +367,7 @@  define Device/arcadyan_arv8539pw22
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
 	ltq-adsl-app ppp-mod-pppoa \
-	kmod-ath9k kmod-owl-loader wpad-mini
+	kmod-ath9k kmod-owl-loader wpad-basic
   SUPPORTED_DEVICES += ARV8539PW22
 endef
 TARGET_DEVICES += arcadyan_arv8539pw22
@@ -380,7 +380,7 @@  define Device/siemens_gigaset-sx76x
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
 	ltq-adsl-app ppp-mod-pppoe \
-	kmod-ath5k wpad-mini
+	kmod-ath5k wpad-basic
   SUPPORTED_DEVICES += GIGASX76X
 endef
 TARGET_DEVICES += siemens_gigaset-sx76x
@@ -398,7 +398,7 @@  define Device/bt_homehub-v3a
 	kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \
 	kmod-ltq-deu-ar9 \
 	ltq-adsl-app ppp-mod-pppoa \
-	kmod-ath9k kmod-owl-loader wpad-mini \
+	kmod-ath9k kmod-owl-loader wpad-basic \
 	uboot-envtools
   SUPPORTED_DEVICES += BTHOMEHUBV3A
 endef
@@ -428,7 +428,7 @@  define Device/netgear_dgn3500
 	check-size 16320k | pad-to 16384k
   DEVICE_TITLE := Netgear DGN3500
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
-	kmod-ath9k kmod-owl-loader wpad-mini \
+	kmod-ath9k kmod-owl-loader wpad-basic \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \
 	ltq-adsl-app ppp-mod-pppoa \
@@ -450,7 +450,7 @@  define Device/netgear_dgn3500b
 	check-size 16320k | pad-to 16384k
   DEVICE_TITLE := Netgear DGN3500B
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
-	kmod-ath9k kmod-owl-loader wpad-mini \
+	kmod-ath9k kmod-owl-loader wpad-basic \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
 	ltq-adsl-app ppp-mod-pppoa \
@@ -467,7 +467,7 @@  define Device/buffalo_wbmr-hp-g300h-a
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \
 	ltq-adsl-app ppp-mod-pppoa \
-	kmod-ath9k kmod-owl-loader wpad-mini
+	kmod-ath9k kmod-owl-loader wpad-basic
   SUPPORTED_DEVICES := WBMR buffalo,wbmr-hp-g300h
 endef
 TARGET_DEVICES += buffalo_wbmr-hp-g300h-a
@@ -480,7 +480,7 @@  define Device/buffalo_wbmr-hp-g300h-b
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
 	ltq-adsl-app ppp-mod-pppoa \
-	kmod-ath9k kmod-owl-loader wpad-mini
+	kmod-ath9k kmod-owl-loader wpad-basic
   SUPPORTED_DEVICES := WBMR buffalo,wbmr-hp-g300h
 endef
 TARGET_DEVICES += buffalo_wbmr-hp-g300h-b
@@ -503,7 +503,7 @@  define Device/avm_fritz7320
   DEVICE_DTS := FRITZ7320
   IMAGE_SIZE := 15744k
   DEVICE_TITLE := 1&1 HomeServer - FRITZ7320
-  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-mini \
+  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
 	ltq-adsl-app ppp-mod-pppoa \
@@ -516,7 +516,7 @@  define Device/zte_h201l
   IMAGE_SIZE := 7808k
   DEVICE_DTS := H201L
   DEVICE_TITLE := ZTE H201L - H201L
-  DEVICE_PACKAGES := kmod-ath9k-htc wpad-mini \
+  DEVICE_PACKAGES := kmod-ath9k-htc wpad-basic \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
 	ltq-adsl-app ppp-mod-pppoe \
@@ -530,7 +530,7 @@  define Device/zyxel_p-2601hn
   IMAGE_SIZE := 15616k
   DEVICE_DTS := P2601HNFX
   DEVICE_TITLE := ZyXEL P-2601HN-Fx
-  DEVICE_PACKAGES := kmod-rt2800-usb wpad-mini \
+  DEVICE_PACKAGES := kmod-rt2800-usb wpad-basic \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
 	ltq-adsl-app ppp-mod-pppoe \
@@ -552,7 +552,7 @@  define Device/zyxel_p-2812hnu-f1
   BOARD_NAME := P2812HNUF1
   DEVICE_DTS := P2812HNUF1
   DEVICE_TITLE := ZyXEL P-2812HNU-F1
-  DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
   SUPPORTED_DEVICES += P2812HNUF1
 endef
 TARGET_DEVICES += zyxel_p-2812hnu-f1
@@ -562,7 +562,7 @@  define Device/zyxel_p-2812hnu-f3
   BOARD_NAME := P2812HNUF3
   DEVICE_DTS := P2812HNUF3
   DEVICE_TITLE := ZyXEL P-2812HNU-F3
-  DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini kmod-usb-dwc2
+  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2
   SUPPORTED_DEVICES += P2812HNUF3
 endef
 TARGET_DEVICES += zyxel_p-2812hnu-f3
@@ -589,7 +589,7 @@  define Device/bt_homehub-v5a
   DEVICE_DTS := BTHOMEHUBV5A
   DEVICE_TITLE := BT Home Hub 5A
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader \
-	kmod-ath10k-ct ath10k-firmware-qca988x-ct wpad-mini kmod-usb-dwc2
+	kmod-ath10k-ct ath10k-firmware-qca988x-ct wpad-basic kmod-usb-dwc2
   SUPPORTED_DEVICES += BTHOMEHUBV5A
 endef
 TARGET_DEVICES += bt_homehub-v5a
@@ -615,7 +615,7 @@  define Device/lantiq_easy80920-nand
   DEVICE_DTS := EASY80920NAND
   IMAGE_SIZE := 64512k
   DEVICE_TITLE := Lantiq VR9 - EASY80920NAND
-  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-mini kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += lantiq_easy80920-nand
 
@@ -623,7 +623,7 @@  define Device/lantiq_easy80920-nor
   DEVICE_DTS := EASY80920NOR
   IMAGE_SIZE := 7936k
   DEVICE_TITLE := Lantiq VR9 - EASY80920NOR
-  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-mini kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += lantiq_easy80920-nor
 
@@ -637,7 +637,7 @@  define Device/avm_fritz3370
   IMAGES += eva-kernel.bin eva-filesystem.bin
   IMAGE/eva-kernel.bin := append-kernel
   IMAGE/eva-filesystem.bin := append-ubi
-  DEVICE_PACKAGES := kmod-ath9k wpad-mini kmod-usb-dwc2 fritz-tffs
+  DEVICE_PACKAGES := kmod-ath9k wpad-basic kmod-usb-dwc2 fritz-tffs
 endef
 
 define Device/avm_fritz3370-rev2-hynix
@@ -659,7 +659,7 @@  define Device/avm_fritz7360sl
   IMAGE_SIZE := 15744k
   DEVICE_DTS := FRITZ7360SL
   DEVICE_TITLE := 1&1 HomeServer - FRITZ7360SL
-  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-mini kmod-usb-dwc2
+  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2
   SUPPORTED_DEVICES += FRITZ7360SL
 endef
 TARGET_DEVICES += avm_fritz7360sl
@@ -678,7 +678,7 @@  define Device/buffalo_wbmr-300hpd
   IMAGE_SIZE := 15616k
   DEVICE_DTS := WBMR300
   DEVICE_TITLE := Buffalo WBMR-300HPD
-  DEVICE_PACKAGES := kmod-mt7603 wpad-mini kmod-usb-dwc2
+  DEVICE_PACKAGES := kmod-mt7603 wpad-basic kmod-usb-dwc2
   SUPPORTED_DEVICES += WBMR300
 endef
 TARGET_DEVICES += buffalo_wbmr-300hpd
@@ -687,7 +687,7 @@  define Device/arcadyan_vgv7510kw22-nor
   IMAGE_SIZE := 15232k
   DEVICE_DTS := VGV7510KW22NOR
   DEVICE_TITLE := o2 Box 6431 / Arcadyan VGV7510KW22 (NOR)
-  DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
+  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
   SUPPORTED_DEVICES += VGV7510KW22NOR
 endef
 TARGET_DEVICES += arcadyan_vgv7510kw22-nor
@@ -700,7 +700,7 @@  define Device/arcadyan_vgv7510kw22-brn
   MAGIC := 0x12345678
   CRC32_POLY := 0x04c11db7
   DEVICE_TITLE := o2 Box 6431 / Arcadyan VGV7510KW22 (BRN)
-  DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
+  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
   SUPPORTED_DEVICES += VGV7510KW22BRN
 endef
 TARGET_DEVICES += arcadyan_vgv7510kw22-brn
@@ -709,7 +709,7 @@  define Device/arcadyan_vgv7519-nor
   IMAGE_SIZE := 15360k
   DEVICE_DTS := VGV7519NOR
   DEVICE_TITLE := Experiabox 8 VGV7519
-  DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
+  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
   SUPPORTED_DEVICES += VGV7519NOR
 endef
 TARGET_DEVICES += arcadyan_vgv7519-nor
@@ -722,7 +722,7 @@  define Device/arcadyan_vgv7519-brn
   MAGIC := 0x12345678
   CRC32_POLY := 0x2083b8ed
   DEVICE_TITLE := Experiabox 8 VGV7519 (BRN)
-  DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
+  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
   SUPPORTED_DEVICES += VGV7519BRN
 endef
 TARGET_DEVICES += arcadyan_vgv7519-brn
diff --git a/target/linux/lantiq/image/tp-link.mk b/target/linux/lantiq/image/tp-link.mk
index 561d390d8c..e2dfc08fe5 100644
--- a/target/linux/lantiq/image/tp-link.mk
+++ b/target/linux/lantiq/image/tp-link.mk
@@ -19,7 +19,7 @@  define Device/tplink_tdw8970
   TPLINK_HWREV := 1
   IMAGE_SIZE := 7680k
   DEVICE_TITLE := TP-LINK TD-W8970
-  DEVICE_PACKAGES:= kmod-ath9k wpad-mini kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES:= kmod-ath9k wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
   SUPPORTED_DEVICES += TDW8970
 endef
 TARGET_DEVICES += tplink_tdw8970
@@ -32,7 +32,7 @@  define Device/tplink_tdw8980
   TPLINK_HWREV := 14
   IMAGE_SIZE := 7680k
   DEVICE_TITLE := TP-LINK TD-W8980
-  DEVICE_PACKAGES:= kmod-ath9k kmod-owl-loader wpad-mini kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES:= kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
   SUPPORTED_DEVICES += TDW8980
 endef
 TARGET_DEVICES += tplink_tdw8980
diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile
index 1833f95ba6..c71f34d109 100644
--- a/target/linux/malta/Makefile
+++ b/target/linux/malta/Makefile
@@ -18,6 +18,6 @@  KERNEL_PATCHVER:=4.14
 
 include $(INCLUDE_DIR)/target.mk
 
-DEFAULT_PACKAGES += wpad-mini kmod-mac80211-hwsim kmod-pcnet32
+DEFAULT_PACKAGES += wpad-basic kmod-mac80211-hwsim kmod-pcnet32
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/mediatek/Makefile b/target/linux/mediatek/Makefile
index f61230408a..0fda718714 100644
--- a/target/linux/mediatek/Makefile
+++ b/target/linux/mediatek/Makefile
@@ -14,6 +14,6 @@  KERNEL_PATCHVER:=4.14
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += \
 	kmod-mt76 kmod-leds-gpio kmod-gpio-button-hotplug \
-	wpad-mini
+	wpad-basic
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile
index 1eac544344..552f16e82f 100644
--- a/target/linux/mpc85xx/Makefile
+++ b/target/linux/mpc85xx/Makefile
@@ -22,6 +22,6 @@  include $(INCLUDE_DIR)/target.mk
 
 DEFAULT_PACKAGES += \
 	kmod-input-core kmod-input-gpio-keys kmod-button-hotplug \
-	kmod-leds-gpio swconfig kmod-ath9k wpad-mini
+	kmod-leds-gpio swconfig kmod-ath9k wpad-basic
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/mpc85xx/image/Makefile b/target/linux/mpc85xx/image/Makefile
index 4dd1f17321..349d2961de 100644
--- a/target/linux/mpc85xx/image/Makefile
+++ b/target/linux/mpc85xx/image/Makefile
@@ -31,7 +31,7 @@  ifeq ($(SUBTARGET),generic)
 
 define Device/tl-wdr4900-v1
   DEVICE_TITLE := TP-Link TL-WDR4900
-  DEVICE_PACKAGES := kmod-ath9k wpad-mini
+  DEVICE_PACKAGES := kmod-ath9k wpad-basic
   TPLINK_HWID := 0x49000001
   TPLINK_HWREV := 1
   TPLINK_FLASHLAYOUT := 16Mppc
@@ -50,7 +50,7 @@  ifeq ($(SUBTARGET),p1020)
 
 define Device/hiveap-330
   DEVICE_TITLE := Aerohive HiveAP-330
-  DEVICE_PACKAGES := kmod-ath9k wpad-mini kmod-tpm-i2c-atmel
+  DEVICE_PACKAGES := kmod-ath9k wpad-basic kmod-tpm-i2c-atmel
   BLOCKSIZE := 128k
   KERNEL_NAME := zImage
   KERNEL_SIZE := 8m
diff --git a/target/linux/mvebu/image/cortex-a9.mk b/target/linux/mvebu/image/cortex-a9.mk
index 917228c429..79c3bc7bdb 100644
--- a/target/linux/mvebu/image/cortex-a9.mk
+++ b/target/linux/mvebu/image/cortex-a9.mk
@@ -10,7 +10,7 @@  ifeq ($(SUBTARGET),cortexa9)
 
 define Device/linksys
   DEVICE_TITLE := Linksys $(1)
-  DEVICE_PACKAGES := kmod-mwlwifi wpad-mini swconfig
+  DEVICE_PACKAGES := kmod-mwlwifi wpad-basic swconfig
 endef
 
 define Device/armada-385-linksys
@@ -162,7 +162,7 @@  define Device/turris-omnia
   DEVICE_TITLE := Turris Omnia
   DEVICE_PACKAGES :=  \
     mkf2fs e2fsprogs kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \
-    wpad-mini kmod-ath9k kmod-ath10k-ct ath10k-firmware-qca988x-ct
+    wpad-basic kmod-ath9k kmod-ath10k-ct ath10k-firmware-qca988x-ct
   IMAGES := $$(IMAGE_PREFIX)-sysupgrade.img.gz omnia-medkit-$$(IMAGE_PREFIX)-initramfs.tar.gz
   IMAGE/$$(IMAGE_PREFIX)-sysupgrade.img.gz := boot-img | sdcard-img | gzip | append-metadata
   IMAGE/omnia-medkit-$$(IMAGE_PREFIX)-initramfs.tar.gz := omnia-medkit-initramfs | gzip
diff --git a/target/linux/mvebu/profiles/000-Default.mk b/target/linux/mvebu/profiles/000-Default.mk
index 4b5dbe1173..8690dd8da5 100644
--- a/target/linux/mvebu/profiles/000-Default.mk
+++ b/target/linux/mvebu/profiles/000-Default.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/Default
 	NAME:=Default Profile (all drivers)
-	PACKAGES:= kmod-mwlwifi wpad-mini swconfig mkf2fs e2fsprogs \
+	PACKAGES:= kmod-mwlwifi wpad-basic swconfig mkf2fs e2fsprogs \
 		   mwlwifi-firmware-88w8864 mwlwifi-firmware-88w8964
 endef
 
diff --git a/target/linux/omap/profiles/00-default.mk b/target/linux/omap/profiles/00-default.mk
index c0af55719b..37c0761029 100644
--- a/target/linux/omap/profiles/00-default.mk
+++ b/target/linux/omap/profiles/00-default.mk
@@ -12,7 +12,7 @@  define Profile/Default
 	kmod-usb-net-asix kmod-usb-net-asix-ax88179 kmod-usb-net-hso \
 	kmod-usb-net-kaweth kmod-usb-net-pegasus kmod-usb-net-mcs7830 \
 	kmod-usb-net-smsc95xx kmod-usb-net-dm9601-ether \
-	wpad-mini
+	wpad-basic
   PRIORITY := 1
 endef
 
diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile
index 07583e485f..994c37ea6a 100644
--- a/target/linux/orion/Makefile
+++ b/target/linux/orion/Makefile
@@ -19,6 +19,6 @@  include $(INCLUDE_DIR)/target.mk
 
 KERNELNAME:=zImage
 
-DEFAULT_PACKAGES += kmod-ath9k wpad-mini kmod-rtc-isl1208 uboot-envtools
+DEFAULT_PACKAGES += kmod-ath9k wpad-basic kmod-rtc-isl1208 uboot-envtools
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index a4a0f3d293..e0c2f55ad1 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -75,7 +75,7 @@  define Device/11acnas
   DTS := 11ACNAS
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := WeVO 11AC NAS Router
-  DEVICE_PACKAGES := kmod-mt7603 kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini
+  DEVICE_PACKAGES := kmod-mt7603 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += 11acnas
 
@@ -96,7 +96,7 @@  define Device/dir-860l-b1
 	seama-seal -m "signature=wrgac13_dlink.2013gui_dir860lb" | \
 	check-size $$$$(IMAGE_SIZE)
   DEVICE_TITLE := D-Link DIR-860L B1
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini
+  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += dir-860l-b1
 
@@ -144,7 +144,7 @@  define Device/ew1200
   DEVICE_TITLE := AFOUNDRY EW1200
   DEVICE_PACKAGES := \
 	kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-mt7603 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-mini
+	kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += ew1200
 
@@ -152,7 +152,7 @@  define Device/firewrt
   DTS := FIREWRT
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := Firefly FireWRT
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini
+  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += firewrt
 
@@ -183,7 +183,7 @@  define Device/hc5962
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE)
   DEVICE_TITLE := HiWiFi HC5962
-  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 wpad-mini
+  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 wpad-basic
 endef
 TARGET_DEVICES += hc5962
 
@@ -193,7 +193,7 @@  define Device/iodata_wn-ax1167gr
   KERNEL_INITRAMFS := $$(KERNEL) | \
     iodata-factory 7864320 4 0x1055 $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.bin
   DEVICE_TITLE := I-O DATA WN-AX1167GR
-  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-mini
+  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic
 endef
 TARGET_DEVICES += iodata_wn-ax1167gr
 
@@ -201,7 +201,7 @@  define Device/iodata_wn-gx300gr
   DTS := WN-GX300GR
   IMAGE_SIZE := 7798784
   DEVICE_TITLE := I-O DATA WN-GX300GR
-  DEVICE_PACKAGES := kmod-mt7603 wpad-mini
+  DEVICE_PACKAGES := kmod-mt7603 wpad-basic
 endef
 TARGET_DEVICES += iodata_wn-gx300gr
 
@@ -227,7 +227,7 @@  define Device/mir3g
   DEVICE_TITLE := Xiaomi Mi Router 3G
   SUPPORTED_DEVICES += R3G
   DEVICE_PACKAGES := \
-	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini \
+	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic \
 	uboot-envtools
 endef
 TARGET_DEVICES += mir3g
@@ -245,7 +245,7 @@  define Device/newifi-d1
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
   DEVICE_TITLE := Newifi D1
   DEVICE_PACKAGES := \
-	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini
+	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += newifi-d1
 
@@ -254,7 +254,7 @@  define Device/d-team_newifi-d2
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
   DEVICE_TITLE := Newifi D2
   DEVICE_PACKAGES := \
-	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini
+	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += d-team_newifi-d2
 
@@ -264,7 +264,7 @@  define Device/pbr-m1
   DEVICE_TITLE := PBR-M1
   DEVICE_PACKAGES := \
 	kmod-ata-core kmod-ata-ahci kmod-mt7603 kmod-mt76x2 kmod-sdhci-mt7620 \
-	kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini
+	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += pbr-m1
 
@@ -282,7 +282,7 @@  define Device/r6220
   IMAGE/rootfs.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
   DEVICE_TITLE := Netgear R6220
   DEVICE_PACKAGES := \
-	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini
+	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += r6220
 
@@ -322,7 +322,7 @@  TARGET_DEVICES += mikrotik_rbm11g
 define Device/re350-v1
   DTS := RE350
   DEVICE_TITLE := TP-LINK RE350 v1
-  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-mini
+  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic
   TPLINK_BOARD_ID := RE350-V1
   TPLINK_HWID := 0x0
   TPLINK_HWREV := 0
@@ -338,14 +338,14 @@  TARGET_DEVICES += re350-v1
 define Device/re6500
   DTS := RE6500
   DEVICE_TITLE := Linksys RE6500
-  DEVICE_PACKAGES := kmod-mt76x2 wpad-mini
+  DEVICE_PACKAGES := kmod-mt76x2 wpad-basic
 endef
 TARGET_DEVICES += re6500
 
 define Device/sap-g3200u3
   DTS := SAP-G3200U3
   DEVICE_TITLE := STORYLiNK SAP-G3200U3
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini
+  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += sap-g3200u3
 
@@ -355,7 +355,7 @@  define Device/sk-wb8
   DEVICE_TITLE := SamKnows Whitebox 8
   DEVICE_PACKAGES := \
 	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport \
-	uboot-envtools wpad-mini
+	uboot-envtools wpad-basic
 endef
 TARGET_DEVICES += sk-wb8
 
@@ -407,7 +407,7 @@  define Device/w2914nsv2
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := WeVO W2914NS v2
   DEVICE_PACKAGES := \
-	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini
+	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += w2914nsv2
 
@@ -421,7 +421,7 @@  define Device/wf-2881
   UBINIZE_OPTS := -E 5
   IMAGE/sysupgrade.bin := append-kernel | append-ubi | append-metadata | check-size $$$$(IMAGE_SIZE)
   DEVICE_TITLE := NETIS WF-2881
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini
+  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += wf-2881
 
@@ -431,7 +431,7 @@  define Device/mqmaker_witi-256m
   DEVICE_TITLE := MQmaker WiTi (256MB RAM)
   DEVICE_PACKAGES := \
 	kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-sdhci-mt7620 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-mini
+	kmod-usb-ledtrig-usbport wpad-basic
   SUPPORTED_DEVICES += witi
 endef
 TARGET_DEVICES += mqmaker_witi-256m
@@ -442,7 +442,7 @@  define Device/mqmaker_witi-512m
   DEVICE_TITLE := MQmaker WiTi (512MB RAM)
   DEVICE_PACKAGES := \
 	kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-sdhci-mt7620 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-mini
+	kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += mqmaker_witi-512m
 
@@ -450,7 +450,7 @@  define Device/wndr3700v5
   DTS := WNDR3700V5
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := Netgear WNDR3700v5
-  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 wpad-mini
+  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 wpad-basic
 endef
 TARGET_DEVICES += wndr3700v5
 
@@ -459,7 +459,7 @@  define Device/youhua_wr1200js
   IMAGE_SIZE := 16064k
   DEVICE_TITLE := YouHua WR1200JS
   DEVICE_PACKAGES := \
-	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini
+	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += youhua_wr1200js
 
@@ -468,7 +468,7 @@  define Device/wsr-1166
   IMAGE/sysupgrade.bin := trx | pad-rootfs | append-metadata
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := Buffalo WSR-1166
-  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-mini
+  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic
 endef
 TARGET_DEVICES += wsr-1166
 
@@ -476,7 +476,7 @@  define Device/wsr-600
   DTS := WSR-600
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := Buffalo WSR-600
-  DEVICE_PACKAGES := kmod-mt7603 kmod-rt2800-pci wpad-mini
+  DEVICE_PACKAGES := kmod-mt7603 kmod-rt2800-pci wpad-basic
 endef
 TARGET_DEVICES += wsr-600
 
@@ -485,7 +485,7 @@  define Device/zbt-we1326
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := ZBT WE1326
   DEVICE_PACKAGES := \
-	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-sdhci-mt7620 wpad-mini
+	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-sdhci-mt7620 wpad-basic
 endef
 TARGET_DEVICES += zbt-we1326
 
@@ -495,7 +495,7 @@  define Device/zbtlink_zbt-we3526
   DEVICE_TITLE := ZBT WE3526
   DEVICE_PACKAGES := \
 	kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \
-	kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini
+	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += zbtlink_zbt-we3526
 
@@ -505,7 +505,7 @@  define Device/zbt-wg2626
   DEVICE_TITLE := ZBT WG2626
   DEVICE_PACKAGES := \
 	kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-mini
+	kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += zbt-wg2626
 
@@ -516,7 +516,7 @@  define Device/zbt-wg3526-16M
   DEVICE_TITLE := ZBT WG3526 (16MB flash)
   DEVICE_PACKAGES := \
 	kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \
-	kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini
+	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += zbt-wg3526-16M
 
@@ -527,7 +527,7 @@  define Device/zbt-wg3526-32M
   DEVICE_TITLE := ZBT WG3526 (32MB flash)
   DEVICE_PACKAGES := \
 	kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \
-	kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini
+	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += zbt-wg3526-32M
 
diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk
index 23a83f8403..066cef23cb 100644
--- a/target/linux/ramips/image/rt305x.mk
+++ b/target/linux/ramips/image/rt305x.mk
@@ -652,7 +652,7 @@  TARGET_DEVICES += rt-n10-plus
 define Device/rt-n13u
   DTS := RT-N13U
   DEVICE_TITLE := Asus RT-N13U
-  DEVICE_PACKAGES := kmod-leds-gpio kmod-rt2800-pci wpad-mini kmod-usb-dwc2
+  DEVICE_PACKAGES := kmod-leds-gpio kmod-rt2800-pci kmod-usb-dwc2
 endef
 TARGET_DEVICES += rt-n13u
 
diff --git a/target/linux/ramips/mt7620/target.mk b/target/linux/ramips/mt7620/target.mk
index c4fa2ade75..b58cdcbc1f 100644
--- a/target/linux/ramips/mt7620/target.mk
+++ b/target/linux/ramips/mt7620/target.mk
@@ -7,7 +7,7 @@  BOARDNAME:=MT7620 based boards
 FEATURES+=usb
 CPU_TYPE:=24kc
 
-DEFAULT_PACKAGES += kmod-rt2800-pci kmod-rt2800-soc kmod-mt76 wpad-mini
+DEFAULT_PACKAGES += kmod-rt2800-pci kmod-rt2800-soc kmod-mt76 wpad-basic
 
 define Target/Description
 	Build firmware images for Ralink MT7620 based boards.
diff --git a/target/linux/ramips/mt76x8/target.mk b/target/linux/ramips/mt76x8/target.mk
index ccb1bf5c6d..ef2f878868 100644
--- a/target/linux/ramips/mt76x8/target.mk
+++ b/target/linux/ramips/mt76x8/target.mk
@@ -7,7 +7,7 @@  BOARDNAME:=MT76x8 based boards
 FEATURES+=usb
 CPU_TYPE:=24kc
 
-DEFAULT_PACKAGES += kmod-mt76 wpad-mini
+DEFAULT_PACKAGES += kmod-mt76 wpad-basic
 
 define Target/Description
 	Build firmware images for Ralink MT76x8 based boards.
diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile
index 7979bb4b85..364a3a8b29 100644
--- a/target/linux/rb532/Makefile
+++ b/target/linux/rb532/Makefile
@@ -16,6 +16,6 @@  KERNEL_PATCHVER:=4.9
 
 include $(INCLUDE_DIR)/target.mk
 
-DEFAULT_PACKAGES += wpad-mini kmod-ath5k kmod-input-rb532 e2fsprogs mkf2fs nand-utils
+DEFAULT_PACKAGES += wpad-basic kmod-ath5k kmod-input-rb532 e2fsprogs mkf2fs nand-utils
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/sunxi/image/cortex-a7.mk b/target/linux/sunxi/image/cortex-a7.mk
index 5d6046543b..969864bb76 100644
--- a/target/linux/sunxi/image/cortex-a7.mk
+++ b/target/linux/sunxi/image/cortex-a7.mk
@@ -90,7 +90,7 @@  TARGET_DEVICES += sun7i-a20-cubietruck
 
 define Device/sun7i-a20-lamobo-r1
   DEVICE_TITLE:=Lamobo R1
-  DEVICE_PACKAGES:=kmod-ata-sunxi kmod-rtl8192cu swconfig wpad-mini
+  DEVICE_PACKAGES:=kmod-ata-sunxi kmod-rtl8192cu swconfig wpad-basic
   SUPPORTED_DEVICES:=lamobo,lamobo-r1
   SUNXI_DTS:=sun7i-a20-lamobo-r1
 endef
@@ -132,7 +132,7 @@  define Device/sun8i-h3-nanopi-m1-plus
   DEVICE_TITLE:=FriendlyArm NanoPi M1 Plus
   DEVICE_PACKAGES:=kmod-rtc-sunxi \
 	kmod-leds-gpio kmod-ledtrig-heartbeat \
-	kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-mini
+	kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic
   SUPPORTED_DEVICES:=friendlyarm,nanopi-m1-plus
   SUNXI_DTS:=sun8i-h3-nanopi-m1-plus
 endef
diff --git a/target/linux/sunxi/profiles/00-default.mk b/target/linux/sunxi/profiles/00-default.mk
index ee0bc6bdd9..101769cf7b 100644
--- a/target/linux/sunxi/profiles/00-default.mk
+++ b/target/linux/sunxi/profiles/00-default.mk
@@ -17,7 +17,7 @@  define Profile/Default
 	kmod-sun4i-emac \
 	rtl8188eu-firmware \
 	swconfig \
-	wpad-mini
+	wpad-basic
   PRIORITY := 1
 endef
 
diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile
index e23c72b363..1962249c48 100644
--- a/target/linux/uml/Makefile
+++ b/target/linux/uml/Makefile
@@ -34,7 +34,7 @@  endef
 
 LINUX_TARGET_CONFIG:=$(CURDIR)/config/$(ARCH)
 
-DEFAULT_PACKAGES += wpad-mini kmod-mac80211-hwsim mkf2fs e2fsprogs
+DEFAULT_PACKAGES += wpad-basic kmod-mac80211-hwsim mkf2fs e2fsprogs
 
 endif
 
diff --git a/target/linux/x86/geode/target.mk b/target/linux/x86/geode/target.mk
index 9c608e6f9d..f1d7b9fe14 100644
--- a/target/linux/x86/geode/target.mk
+++ b/target/linux/x86/geode/target.mk
@@ -5,7 +5,7 @@  DEFAULT_PACKAGES += \
 			kmod-ath5k kmod-ath9k \
 			kmod-button-hotplug \
 			kmod-ledtrig-heartbeat kmod-ledtrig-gpio \
-			kmod-ledtrig-netdev hwclock wpad-mini
+			kmod-ledtrig-netdev hwclock wpad-basic
 # Geos
 DEFAULT_PACKAGES += \
 		soloscli linux-atm br2684ctl ppp-mod-pppoa pppdump pppstats \