diff mbox series

[v2,2/3] treewide: use wpad-basic-wolfssl as default

Message ID 20200727095635.32303-2-ynezz@true.cz
State Superseded
Delegated to: Petr Štetiar
Headers show
Series [v2,1/3] hostapd: add wpad-basic-wolfssl variant | expand

Commit Message

Petr Štetiar July 27, 2020, 9:56 a.m. UTC
In order to support SAE/WPA3-Personal in default images. Replaced all
occurencies of wpad-basic and wpad-mini with wpad-basic-wolfssl for
consistency.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
---

changed in v2:

 * replacement of wpad-mini with wpad-basic-wolfssl for consistency

 target/linux/apm821xx/image/sata.mk           |   2 +-
 target/linux/apm821xx/nand/target.mk          |   2 +-
 .../apm821xx/sata/profiles/00-default.mk      |   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/ath25/Makefile                   |   2 +-
 target/linux/ath79/generic/target.mk          |   2 +-
 target/linux/ath79/image/generic-ubnt.mk      |   2 +-
 target/linux/ath79/image/generic.mk           |   4 +-
 target/linux/ath79/mikrotik/target.mk         |   2 +-
 target/linux/ath79/nand/target.mk             |   2 +-
 target/linux/ath79/tiny/target.mk             |   2 +-
 target/linux/bcm27xx/image/Makefile           |   8 +-
 .../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 +-
 .../bcm47xx/generic/profiles/PS-1208MFG.mk    |   2 +-
 target/linux/bcm47xx/generic/target.mk        |   2 +-
 .../legacy/profiles/101-Broadcom-wl.mk        |   2 +-
 target/linux/bcm47xx/legacy/target.mk         |   2 +-
 .../mips74k/profiles/102-Broadcom-wl.mk       |   2 +-
 .../mips74k/profiles/103-Broadcom-none.mk     |   2 +-
 target/linux/bcm47xx/mips74k/target.mk        |   2 +-
 target/linux/bcm53xx/image/Makefile           |   2 +-
 target/linux/bcm63xx/image/Makefile           |  10 +-
 target/linux/bcm63xx/profiles/default.mk      |   2 +-
 target/linux/cns3xxx/Makefile                 |   2 +-
 target/linux/ipq40xx/Makefile                 |   2 +-
 target/linux/ipq806x/Makefile                 |   2 +-
 target/linux/kirkwood/image/Makefile          |   6 +-
 target/linux/kirkwood/profiles/00-default.mk  |   2 +-
 target/linux/lantiq/image/ar9.mk              |  18 +--
 target/linux/lantiq/image/danube.mk           |  24 ++--
 target/linux/lantiq/image/tp-link.mk          |   8 +-
 target/linux/lantiq/image/vr9.mk              |  30 ++---
 target/linux/lantiq/image/xway_legacy.mk      |  10 +-
 target/linux/malta/Makefile                   |   2 +-
 target/linux/mediatek/mt7622/target.mk        |   2 +-
 target/linux/mpc85xx/Makefile                 |   2 +-
 target/linux/mvebu/image/cortexa9.mk          |   4 +-
 target/linux/omap/profiles/00-default.mk      |   2 +-
 target/linux/oxnas/image/ox820.mk             |   2 +-
 target/linux/ramips/image/mt7620.mk           |   2 +-
 target/linux/ramips/image/mt7621.mk           | 124 +++++++++---------
 target/linux/ramips/mt7620/target.mk          |   2 +-
 target/linux/ramips/mt76x8/target.mk          |   2 +-
 target/linux/ramips/rt288x/target.mk          |   2 +-
 target/linux/ramips/rt305x/target.mk          |   2 +-
 target/linux/ramips/rt3883/target.mk          |   2 +-
 target/linux/rb532/Makefile                   |   2 +-
 target/linux/sunxi/image/cortexa7.mk          |   8 +-
 target/linux/sunxi/profiles/00-default.mk     |   2 +-
 target/linux/tegra/image/Makefile             |   2 +-
 target/linux/uml/Makefile                     |   2 +-
 64 files changed, 180 insertions(+), 180 deletions(-)

Comments

Adrian Schmutzler July 27, 2020, 10:04 a.m. UTC | #1
> -----Original Message-----
> From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org]
> On Behalf Of Petr Štetiar
> Sent: Montag, 27. Juli 2020 11:57
> To: openwrt-devel@lists.openwrt.org
> Cc: Petr Štetiar <ynezz@true.cz>
> Subject: [PATCH v2 2/3] treewide: use wpad-basic-wolfssl as default
> 
> In order to support SAE/WPA3-Personal in default images. Replaced all
> occurencies of wpad-basic and wpad-mini with wpad-basic-wolfssl for
> consistency.

Hi,

as stated earlier, I'm fine with covering ath79/tiny etc. as well, but I'd personally not touch ar71xx.

Just in case you overlooked that beforehand; if this is also intentional (=consistency) it won't cry if you keep it, though.

Thanks for taking care of this stuff BTW.

Best

Adrian



> 
> Signed-off-by: Petr Štetiar <ynezz@true.cz>
> ---
> 
> changed in v2:
> 
>  * replacement of wpad-mini with wpad-basic-wolfssl for consistency
> 
>  target/linux/apm821xx/image/sata.mk           |   2 +-
>  target/linux/apm821xx/nand/target.mk          |   2 +-
>  .../apm821xx/sata/profiles/00-default.mk      |   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/ath25/Makefile                   |   2 +-
>  target/linux/ath79/generic/target.mk          |   2 +-
>  target/linux/ath79/image/generic-ubnt.mk      |   2 +-
>  target/linux/ath79/image/generic.mk           |   4 +-
>  target/linux/ath79/mikrotik/target.mk         |   2 +-
>  target/linux/ath79/nand/target.mk             |   2 +-
>  target/linux/ath79/tiny/target.mk             |   2 +-
>  target/linux/bcm27xx/image/Makefile           |   8 +-
>  .../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 +-
>  .../bcm47xx/generic/profiles/PS-1208MFG.mk    |   2 +-
>  target/linux/bcm47xx/generic/target.mk        |   2 +-
>  .../legacy/profiles/101-Broadcom-wl.mk        |   2 +-
>  target/linux/bcm47xx/legacy/target.mk         |   2 +-
>  .../mips74k/profiles/102-Broadcom-wl.mk       |   2 +-
>  .../mips74k/profiles/103-Broadcom-none.mk     |   2 +-
>  target/linux/bcm47xx/mips74k/target.mk        |   2 +-
>  target/linux/bcm53xx/image/Makefile           |   2 +-
>  target/linux/bcm63xx/image/Makefile           |  10 +-
>  target/linux/bcm63xx/profiles/default.mk      |   2 +-
>  target/linux/cns3xxx/Makefile                 |   2 +-
>  target/linux/ipq40xx/Makefile                 |   2 +-
>  target/linux/ipq806x/Makefile                 |   2 +-
>  target/linux/kirkwood/image/Makefile          |   6 +-
>  target/linux/kirkwood/profiles/00-default.mk  |   2 +-
>  target/linux/lantiq/image/ar9.mk              |  18 +--
>  target/linux/lantiq/image/danube.mk           |  24 ++--
>  target/linux/lantiq/image/tp-link.mk          |   8 +-
>  target/linux/lantiq/image/vr9.mk              |  30 ++---
>  target/linux/lantiq/image/xway_legacy.mk      |  10 +-
>  target/linux/malta/Makefile                   |   2 +-
>  target/linux/mediatek/mt7622/target.mk        |   2 +-
>  target/linux/mpc85xx/Makefile                 |   2 +-
>  target/linux/mvebu/image/cortexa9.mk          |   4 +-
>  target/linux/omap/profiles/00-default.mk      |   2 +-
>  target/linux/oxnas/image/ox820.mk             |   2 +-
>  target/linux/ramips/image/mt7620.mk           |   2 +-
>  target/linux/ramips/image/mt7621.mk           | 124 +++++++++---------
>  target/linux/ramips/mt7620/target.mk          |   2 +-
>  target/linux/ramips/mt76x8/target.mk          |   2 +-
>  target/linux/ramips/rt288x/target.mk          |   2 +-
>  target/linux/ramips/rt305x/target.mk          |   2 +-
>  target/linux/ramips/rt3883/target.mk          |   2 +-
>  target/linux/rb532/Makefile                   |   2 +-
>  target/linux/sunxi/image/cortexa7.mk          |   8 +-
>  target/linux/sunxi/profiles/00-default.mk     |   2 +-
>  target/linux/tegra/image/Makefile             |   2 +-
>  target/linux/uml/Makefile                     |   2 +-
>  64 files changed, 180 insertions(+), 180 deletions(-)
> 
> diff --git a/target/linux/apm821xx/image/sata.mk
> b/target/linux/apm821xx/image/sata.mk
> index 6fe8324b93ac..bcb612c22f1d 100644
> --- a/target/linux/apm821xx/image/sata.mk
> +++ b/target/linux/apm821xx/image/sata.mk
> @@ -6,7 +6,7 @@ endef
>  define Device/wd_mybooklive
>    DEVICE_VENDOR := Western Digital
>    DEVICE_MODEL := My Book Live Series (Single + Duo)
> -  DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-
> usb-storage kmod-fs-vfat wpad-basic
> +  DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-
> usb-storage kmod-fs-vfat wpad-basic-wolfssl
>    SUPPORTED_DEVICES += mbl wd,mybooklive-duo
>    BLOCKSIZE := 1k
>    DTB_SIZE := 16384
> diff --git a/target/linux/apm821xx/nand/target.mk
> b/target/linux/apm821xx/nand/target.mk
> index 16475307d732..d40b0fbc19b5 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-basic
> +DEFAULT_PACKAGES += kmod-ath9k swconfig wpad-basic-wolfssl
> 
>  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 db48353bf299..887741abd384 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-basic
> +  PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-
> storage kmod-fs-vfat wpad-basic-wolfssl
>  endef
> 
>  define Profile/Default/Description
> diff --git a/target/linux/ar71xx/generic/target.mk
> b/target/linux/ar71xx/generic/target.mk
> index 0a26110d27a8..d8e3ff217d81 100644
> --- a/target/linux/ar71xx/generic/target.mk
> +++ b/target/linux/ar71xx/generic/target.mk
> @@ -1,7 +1,7 @@
>  BOARDNAME:=Generic
>  FEATURES += squashfs
> 
> -DEFAULT_PACKAGES += wpad-basic
> +DEFAULT_PACKAGES += wpad-basic-wolfssl
> 
>  define Target/Description
>  	Build firmware images for generic Atheros AR71xx/AR913x/AR934x
> based boards.
> diff --git a/target/linux/ar71xx/image/generic.mk
> b/target/linux/ar71xx/image/generic.mk
> index 5098650ec7a6..dc1f0ba6a8be 100644
> --- a/target/linux/ar71xx/image/generic.mk
> +++ b/target/linux/ar71xx/image/generic.mk
> @@ -547,7 +547,7 @@ define Device/lan-turtle
>    $(Device/tplink-16mlzma)
>    DEVICE_TITLE := Hak5 LAN Turtle
>    DEVICE_PACKAGES := kmod-usb2 kmod-usb-storage \
> -	-kmod-ath9k -swconfig -uboot-envtools -wpad-basic
> +	-kmod-ath9k -swconfig -uboot-envtools -wpad-basic-wolfssl
>    BOARDNAME := LAN-TURTLE
>    DEVICE_PROFILE := LANTURTLE
>    TPLINK_HWID := 0x5348334c
> @@ -704,7 +704,7 @@ define Device/packet-squirrel
>    $(Device/tplink-16mlzma)
>    DEVICE_TITLE := Hak5 Packet Squirrel
>    DEVICE_PACKAGES := kmod-usb2 \
> -	-kmod-ath9k -swconfig -uboot-envtools -wpad-basic
> +	-kmod-ath9k -swconfig -uboot-envtools -wpad-basic-wolfssl
>    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 5ae57fadb38f..be5842c4e521 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 wpad-basic
> +DEFAULT_PACKAGES += nand-utils wpad-basic-wolfssl
> 
>  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 d5191b22608e..10e66fff015f 100644
> --- a/target/linux/ar71xx/nand/target.mk
> +++ b/target/linux/ar71xx/nand/target.mk
> @@ -1,7 +1,7 @@
>  BOARDNAME := Generic devices with NAND flash
>  FEATURES += squashfs nand rtc
> 
> -DEFAULT_PACKAGES += wpad-basic
> +DEFAULT_PACKAGES += wpad-basic-wolfssl
> 
>  define Target/Description
>  	Build firmware images for Atheros AR71xx/AR913x based boards with
> diff --git a/target/linux/ar71xx/tiny/target.mk
> b/target/linux/ar71xx/tiny/target.mk
> index 89d4447e1e4a..506e86e6b65f 100644
> --- a/target/linux/ar71xx/tiny/target.mk
> +++ b/target/linux/ar71xx/tiny/target.mk
> @@ -1,7 +1,7 @@
>  BOARDNAME:=Devices with small flash
>  FEATURES += squashfs small_flash
> 
> -DEFAULT_PACKAGES += wpad-mini
> +DEFAULT_PACKAGES += wpad-basic-wolfssl
> 
>  define Target/Description
>  	Build firmware images for Atheros AR71xx/AR913x/AR934x based
> boards with small NOR flash.
> diff --git a/target/linux/arc770/generic/profiles/00-default.mk
> b/target/linux/arc770/generic/profiles/00-default.mk
> index 2ca93ddb040c..9f6966317048 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-ohci kmod-usb2 kmod-ath9k-htc wpad-basic
> +	PACKAGES:= kmod-usb-ohci kmod-usb2 kmod-ath9k-htc wpad-basic-
> wolfssl
>  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 ec9bbbb19ff4..172ad4bcfbe3 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-usb2 kmod-ath9k-htc wpad-basic
> +	PACKAGES:= kmod-usb2 kmod-ath9k-htc wpad-basic-wolfssl
>  endef
> 
>  define Profile/Default/Description
> diff --git a/target/linux/ath25/Makefile b/target/linux/ath25/Makefile
> index 4fb082edfd67..f8851124608e 100644
> --- a/target/linux/ath25/Makefile
> +++ b/target/linux/ath25/Makefile
> @@ -19,6 +19,6 @@ endef
> 
>  include $(INCLUDE_DIR)/target.mk
> 
> -DEFAULT_PACKAGES += wpad-mini kmod-ath5k swconfig kmod-gpio-
> button-hotplug
> +DEFAULT_PACKAGES += wpad-basic-wolfssl kmod-ath5k swconfig kmod-
> gpio-button-hotplug
> 
>  $(eval $(call BuildTarget))
> diff --git a/target/linux/ath79/generic/target.mk
> b/target/linux/ath79/generic/target.mk
> index 88346efd2b09..0624f795726a 100644
> --- a/target/linux/ath79/generic/target.mk
> +++ b/target/linux/ath79/generic/target.mk
> @@ -1,7 +1,7 @@
>  BOARDNAME:=Generic
>  FEATURES += squashfs
> 
> -DEFAULT_PACKAGES += wpad-basic
> +DEFAULT_PACKAGES += wpad-basic-wolfssl
> 
>  define Target/Description
>  	Build firmware images for generic Atheros AR71xx/AR913x/AR934x
> based boards.
> diff --git a/target/linux/ath79/image/generic-ubnt.mk
> b/target/linux/ath79/image/generic-ubnt.mk
> index 55d98ce5085a..b94518377690 100644
> --- a/target/linux/ath79/image/generic-ubnt.mk
> +++ b/target/linux/ath79/image/generic-ubnt.mk
> @@ -287,7 +287,7 @@ endef
>  TARGET_DEVICES += ubnt_rocket-m
> 
>  define Device/ubnt_routerstation_common
> -  DEVICE_PACKAGES := -kmod-ath9k -wpad-mini -uboot-envtools kmod-
> usb-ohci \
> +  DEVICE_PACKAGES := -kmod-ath9k -wpad-basic-wolfssl -uboot-envtools
> kmod-usb-ohci \
>  	kmod-usb2 fconfig
>    DEVICE_VENDOR := Ubiquiti
>    SOC := ar7161
> diff --git a/target/linux/ath79/image/generic.mk
> b/target/linux/ath79/image/generic.mk
> index 8dc16983e1cb..d161e408fae8 100644
> --- a/target/linux/ath79/image/generic.mk
> +++ b/target/linux/ath79/image/generic.mk
> @@ -918,7 +918,7 @@ define Device/iodata_etg3-r
>    DEVICE_VENDOR := I-O DATA
>    DEVICE_MODEL := ETG3-R
>    IMAGE_SIZE := 7680k
> -  DEVICE_PACKAGES := -iwinfo -kmod-ath9k -wpad-basic
> +  DEVICE_PACKAGES := -iwinfo -kmod-ath9k -wpad-basic-wolfssl
>  endef
>  TARGET_DEVICES += iodata_etg3-r
> 
> @@ -978,7 +978,7 @@ define Device/jjplus_ja76pf2
>    SOC := ar7161
>    DEVICE_VENDOR := jjPlus
>    DEVICE_MODEL := JA76PF2
> -  DEVICE_PACKAGES += -kmod-ath9k -swconfig -wpad-mini -uboot-envtools
> fconfig
> +  DEVICE_PACKAGES += -kmod-ath9k -swconfig -wpad-basic-wolfssl -uboot-
> envtools fconfig
>    IMAGES := kernel.bin rootfs.bin
>    IMAGE/kernel.bin := append-kernel
>    IMAGE/rootfs.bin := append-rootfs | pad-rootfs
> diff --git a/target/linux/ath79/mikrotik/target.mk
> b/target/linux/ath79/mikrotik/target.mk
> index face016a51f2..0394f4427ddd 100644
> --- a/target/linux/ath79/mikrotik/target.mk
> +++ b/target/linux/ath79/mikrotik/target.mk
> @@ -1,7 +1,7 @@
>  BOARDNAME := MikroTik devices
>  FEATURES += minor nand squashfs
> 
> -DEFAULT_PACKAGES += wpad-basic
> +DEFAULT_PACKAGES += wpad-basic-wolfssl
> 
>  define Target/Description
>  	Build firmware images for MikroTik devices based on Qualcomm
> Atheros
> diff --git a/target/linux/ath79/nand/target.mk
> b/target/linux/ath79/nand/target.mk
> index c565c9b2b8c4..a4069d7610be 100644
> --- a/target/linux/ath79/nand/target.mk
> +++ b/target/linux/ath79/nand/target.mk
> @@ -2,7 +2,7 @@ BOARDNAME := Generic devices with NAND flash
> 
>  FEATURES += squashfs nand
> 
> -DEFAULT_PACKAGES += wpad-basic
> +DEFAULT_PACKAGES += wpad-basic-wolfssl
> 
>  define Target/Description
>  	Firmware for boards using Qualcomm Atheros, MIPS-based SoCs
> diff --git a/target/linux/ath79/tiny/target.mk
> b/target/linux/ath79/tiny/target.mk
> index dba57e5965f3..2ee71ea92137 100644
> --- a/target/linux/ath79/tiny/target.mk
> +++ b/target/linux/ath79/tiny/target.mk
> @@ -1,7 +1,7 @@
>  BOARDNAME:=Devices with small flash
>  FEATURES += squashfs small_flash
> 
> -DEFAULT_PACKAGES += wpad-mini
> +DEFAULT_PACKAGES += wpad-basic-wolfssl
> 
>  define Target/Description
>  	Build firmware images for Atheros AR71xx/AR913x/AR934x based
> boards with small flash
> diff --git a/target/linux/bcm27xx/image/Makefile
> b/target/linux/bcm27xx/image/Makefile
> index 2b97593c9a25..f009b997e973 100644
> --- a/target/linux/bcm27xx/image/Makefile
> +++ b/target/linux/bcm27xx/image/Makefile
> @@ -79,7 +79,7 @@ define Device/rpi
>    DEVICE_PACKAGES := \
>  	cypress-firmware-43430-sdio \
>  	cypress-nvram-43430-sdio-rpi-zero-w \
> -	kmod-brcmfmac wpad-basic
> +	kmod-brcmfmac wpad-basic-wolfssl
>  endef
>  ifeq ($(SUBTARGET),bcm2708)
>    TARGET_DEVICES += rpi
> @@ -103,7 +103,7 @@ define Device/rpi-2
>  	cypress-nvram-43430-sdio-rpi-3b \
>  	cypress-firmware-43455-sdio \
>  	cypress-nvram-43455-sdio-rpi-3b-plus cypress-nvram-43455-sdio-rpi-
> 4b \
> -	kmod-brcmfmac wpad-basic
> +	kmod-brcmfmac wpad-basic-wolfssl
>    IMAGE/sysupgrade.img.gz := boot-common | boot-2708 | boot-2711 |
> sdcard-img | gzip | append-metadata
>    IMAGE/factory.img.gz := boot-common | boot-2708 | boot-2711 | sdcard-
> img | gzip
>  endef
> @@ -128,7 +128,7 @@ define Device/rpi-3
>  	cypress-nvram-43430-sdio-rpi-3b \
>  	cypress-firmware-43455-sdio \
>  	cypress-nvram-43455-sdio-rpi-3b-plus \
> -	kmod-brcmfmac wpad-basic
> +	kmod-brcmfmac wpad-basic-wolfssl
>  endef
>  ifeq ($(SUBTARGET),bcm2710)
>    TARGET_DEVICES += rpi-3
> @@ -143,7 +143,7 @@ define Device/rpi-4
>    DEVICE_PACKAGES := \
>  	cypress-firmware-43455-sdio \
>  	cypress-nvram-43455-sdio-rpi-4b \
> -	kmod-brcmfmac wpad-basic
> +	kmod-brcmfmac wpad-basic-wolfssl
>    IMAGE/sysupgrade.img.gz := boot-common | boot-2711 | sdcard-img | gzip
> | append-metadata
>    IMAGE/factory.img.gz := boot-common | boot-2711 | sdcard-img | gzip
>  endef
> diff --git a/target/linux/bcm47xx/generic/profiles/101-Broadcom-wl.mk
> b/target/linux/bcm47xx/generic/profiles/101-Broadcom-wl.mk
> index c3e9d20c1374..db0a31d6caf2 100644
> --- a/target/linux/bcm47xx/generic/profiles/101-Broadcom-wl.mk
> +++ b/target/linux/bcm47xx/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-basic kmod-b44 kmod-tg3 kmod-bgmac kmod-brcm-wl
> wlc nas
> +  PACKAGES:=-wpad-basic-wolfssl kmod-b44 kmod-tg3 kmod-bgmac kmod-
> brcm-wl wlc nas
>  endef
> 
>  define Profile/Broadcom-wl/Description
> diff --git a/target/linux/bcm47xx/generic/profiles/105-Broadcom-none.mk
> b/target/linux/bcm47xx/generic/profiles/105-Broadcom-none.mk
> index 4497124a2e99..9c66d5796781 100644
> --- a/target/linux/bcm47xx/generic/profiles/105-Broadcom-none.mk
> +++ b/target/linux/bcm47xx/generic/profiles/105-Broadcom-none.mk
> @@ -7,7 +7,7 @@
> 
>  define Profile/Broadcom-none
>    NAME:=Broadcom SoC, all Ethernet, No WiFi
> -  PACKAGES:=-wpad-basic kmod-b44 kmod-tg3 kmod-bgmac
> +  PACKAGES:=-wpad-basic-wolfssl kmod-b44 kmod-tg3 kmod-bgmac
>  endef
> 
>  define Profile/Broadcom-none/Description
> diff --git a/target/linux/bcm47xx/generic/profiles/201-Broadcom-b44-wl.mk
> b/target/linux/bcm47xx/generic/profiles/201-Broadcom-b44-wl.mk
> index 79b7c5c0002e..fe6c2d8f87ae 100644
> --- a/target/linux/bcm47xx/generic/profiles/201-Broadcom-b44-wl.mk
> +++ b/target/linux/bcm47xx/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-basic kmod-b44 kmod-brcm-wl wlc nas
> +  PACKAGES:=-wpad-basic-wolfssl kmod-b44 kmod-brcm-wl wlc nas
>  endef
> 
>  define Profile/Broadcom-b44-wl/Description
> diff --git a/target/linux/bcm47xx/generic/profiles/205-Broadcom-b44-
> none.mk b/target/linux/bcm47xx/generic/profiles/205-Broadcom-b44-
> none.mk
> index 0854b5041ee8..6c409057cc7a 100644
> --- a/target/linux/bcm47xx/generic/profiles/205-Broadcom-b44-none.mk
> +++ b/target/linux/bcm47xx/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-basic kmod-b44
> +  PACKAGES:=-wpad-basic-wolfssl kmod-b44
>  endef
> 
>  define Profile/Broadcom-b44-none/Description
> diff --git a/target/linux/bcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk
> b/target/linux/bcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk
> index 6946668c915d..20acd75bc505 100644
> --- a/target/linux/bcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk
> +++ b/target/linux/bcm47xx/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-basic kmod-brcm-wl wlc nas kmod-tg3
> +  PACKAGES:=-wpad-basic-wolfssl kmod-brcm-wl wlc nas kmod-tg3
>  endef
> 
>  define Profile/Broadcom-tg3-wl/Description
> diff --git a/target/linux/bcm47xx/generic/profiles/215-Broadcom-tg3-
> none.mk b/target/linux/bcm47xx/generic/profiles/215-Broadcom-tg3-
> none.mk
> index a5a3b4a0104a..7974279bc4f8 100644
> --- a/target/linux/bcm47xx/generic/profiles/215-Broadcom-tg3-none.mk
> +++ b/target/linux/bcm47xx/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-basic kmod-tg3
> +  PACKAGES:=-wpad-basic-wolfssl kmod-tg3
>  endef
> 
>  define Profile/Broadcom-tg3-none/Description
> diff --git a/target/linux/bcm47xx/generic/profiles/221-Broadcom-bgmac-
> wl.mk b/target/linux/bcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk
> index acdc20fb7021..bb7e7c2c9ca1 100644
> --- a/target/linux/bcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk
> +++ b/target/linux/bcm47xx/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-basic kmod-bgmac kmod-brcm-wl wlc nas
> +  PACKAGES:=-wpad-basic-wolfssl kmod-bgmac kmod-brcm-wl wlc nas
>  endef
> 
>  define Profile/Broadcom-bgmac-wl/Description
> diff --git a/target/linux/bcm47xx/generic/profiles/225-Broadcom-bgmac-
> none.mk b/target/linux/bcm47xx/generic/profiles/225-Broadcom-bgmac-
> none.mk
> index db2d1a264c61..77299cd501a7 100644
> --- a/target/linux/bcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk
> +++ b/target/linux/bcm47xx/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-basic kmod-bgmac
> +  PACKAGES:=-wpad-basic-wolfssl kmod-bgmac
>  endef
> 
>  define Profile/Broadcom-bgmac-none/Description
> diff --git a/target/linux/bcm47xx/generic/profiles/PS-1208MFG.mk
> b/target/linux/bcm47xx/generic/profiles/PS-1208MFG.mk
> index 14ee46f20042..90c2688c8ec7 100644
> --- a/target/linux/bcm47xx/generic/profiles/PS-1208MFG.mk
> +++ b/target/linux/bcm47xx/generic/profiles/PS-1208MFG.mk
> @@ -7,7 +7,7 @@
> 
>  define Profile/Ps1208mfg
>    NAME:=Edimax PS-1208MFG
> -  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
> +  PACKAGES:=-firewall -dropbear -dnsmasq -mtd -ppp -wpad-basic-wolfssl
> 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/bcm47xx/generic/target.mk
> b/target/linux/bcm47xx/generic/target.mk
> index 2f93778b09cf..70397de39896 100644
> --- a/target/linux/bcm47xx/generic/target.mk
> +++ b/target/linux/bcm47xx/generic/target.mk
> @@ -1,7 +1,7 @@
>  BOARDNAME:=Generic
>  FEATURES+=pcmcia
> 
> -DEFAULT_PACKAGES += wpad-basic
> +DEFAULT_PACKAGES += wpad-basic-wolfssl
> 
>  define Target/Description
>  	Build generic firmware for all Broadcom BCM47xx and BCM53xx MIPS
> diff --git a/target/linux/bcm47xx/legacy/profiles/101-Broadcom-wl.mk
> b/target/linux/bcm47xx/legacy/profiles/101-Broadcom-wl.mk
> index 6a4c5b039481..26bbacf3bed3 100644
> --- a/target/linux/bcm47xx/legacy/profiles/101-Broadcom-wl.mk
> +++ b/target/linux/bcm47xx/legacy/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-brcm-wl-mini wlc nas
> +  PACKAGES:=-wpad-basic-wolfssl kmod-brcm-wl-mini wlc nas
>  endef
> 
>  define Profile/Broadcom-wl/Description
> diff --git a/target/linux/bcm47xx/legacy/target.mk
> b/target/linux/bcm47xx/legacy/target.mk
> index fca612855877..e3586a8add72 100644
> --- a/target/linux/bcm47xx/legacy/target.mk
> +++ b/target/linux/bcm47xx/legacy/target.mk
> @@ -1,7 +1,7 @@
>  FEATURES += low_mem pcmcia small_flash
>  BOARDNAME:=Legacy (BMIPS3300)
> 
> -DEFAULT_PACKAGES += wpad-mini
> +DEFAULT_PACKAGES += wpad-basic-wolfssl
> 
>  define Target/Description
>  	Build firmware for Broadcom BCM47xx and BCM53xx devices with
> diff --git a/target/linux/bcm47xx/mips74k/profiles/102-Broadcom-wl.mk
> b/target/linux/bcm47xx/mips74k/profiles/102-Broadcom-wl.mk
> index 66b13bf879aa..8f60c7ee32e7 100644
> --- a/target/linux/bcm47xx/mips74k/profiles/102-Broadcom-wl.mk
> +++ b/target/linux/bcm47xx/mips74k/profiles/102-Broadcom-wl.mk
> @@ -7,7 +7,7 @@
> 
>  define Profile/Broadcom-mips74k-wl
>    NAME:=Broadcom SoC, BCM43xx WiFi (proprietary wl)
> -  PACKAGES:=-wpad-basic kmod-brcm-wl wlc nas
> +  PACKAGES:=-wpad-basic-wolfssl kmod-brcm-wl wlc nas
>  endef
> 
>  define Profile/Broadcom-mips74k-wl/Description
> diff --git a/target/linux/bcm47xx/mips74k/profiles/103-Broadcom-none.mk
> b/target/linux/bcm47xx/mips74k/profiles/103-Broadcom-none.mk
> index cc4668de5244..66e9a9f0f7fa 100644
> --- a/target/linux/bcm47xx/mips74k/profiles/103-Broadcom-none.mk
> +++ b/target/linux/bcm47xx/mips74k/profiles/103-Broadcom-none.mk
> @@ -7,7 +7,7 @@
> 
>  define Profile/Broadcom-mips74k-none
>    NAME:=Broadcom SoC, No WiFi
> -  PACKAGES:=-wpad-basic
> +  PACKAGES:=-wpad-basic-wolfssl
>  endef
> 
>  define Profile/Broadcom-mips74k-none/Description
> diff --git a/target/linux/bcm47xx/mips74k/target.mk
> b/target/linux/bcm47xx/mips74k/target.mk
> index 1e2e8436d5ee..ee20982e542a 100644
> --- a/target/linux/bcm47xx/mips74k/target.mk
> +++ b/target/linux/bcm47xx/mips74k/target.mk
> @@ -1,7 +1,7 @@
>  BOARDNAME:=MIPS 74K
>  CPU_TYPE:=74kc
> 
> -DEFAULT_PACKAGES += wpad-basic
> +DEFAULT_PACKAGES += wpad-basic-wolfssl
> 
>  define Target/Description
>  	Build firmware for Broadcom BCM47xx and BCM53xx devices with
> diff --git a/target/linux/bcm53xx/image/Makefile
> b/target/linux/bcm53xx/image/Makefile
> index b3ec1e99a28f..0e3779080233 100644
> --- a/target/linux/bcm53xx/image/Makefile
> +++ b/target/linux/bcm53xx/image/Makefile
> @@ -113,7 +113,7 @@ DEVICE_VARS += SIGNATURE
>  DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_REGION TPLINK_BOARD
>  DEVICE_VARS += LUXUL_BOARD
> 
> -IEEE8021X := wpad-basic
> +IEEE8021X := wpad-basic-wolfssl
>  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/bcm63xx/image/Makefile
> b/target/linux/bcm63xx/image/Makefile
> index 90d87f7bd46f..d8e68862b320 100644
> --- a/target/linux/bcm63xx/image/Makefile
> +++ b/target/linux/bcm63xx/image/Makefile
> @@ -311,12 +311,12 @@ define Device/Default
>  endef
>  DEVICE_VARS += CHIP_ID DEVICE_LOADADDR
> 
> -ATH5K_PACKAGES := kmod-ath5k wpad-basic
> -ATH9K_PACKAGES := kmod-ath9k wpad-basic
> -B43_PACKAGES := kmod-b43 wpad-basic
> +ATH5K_PACKAGES := kmod-ath5k wpad-basic-wolfssl
> +ATH9K_PACKAGES := kmod-ath9k wpad-basic-wolfssl
> +B43_PACKAGES := kmod-b43 wpad-basic-wolfssl
>  BRCMWL_PACKAGES := kmod-brcm-wl nas wlc
> -RT28_PACKAGES := kmod-rt2800-pci wpad-basic
> -RT61_PACKAGES := kmod-rt61-pci wpad-basic
> +RT28_PACKAGES := kmod-rt2800-pci wpad-basic-wolfssl
> +RT61_PACKAGES := kmod-rt61-pci wpad-basic-wolfssl
>  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/bcm63xx/profiles/default.mk
> b/target/linux/bcm63xx/profiles/default.mk
> index 95cd67c46ea1..2df9d062ff68 100644
> --- a/target/linux/bcm63xx/profiles/default.mk
> +++ b/target/linux/bcm63xx/profiles/default.mk
> @@ -7,7 +7,7 @@
> 
>  define Profile/Default
>    NAME:=Default Profile
> -  PACKAGES:=kmod-b43 wpad-basic
> +  PACKAGES:=kmod-b43 wpad-basic-wolfssl
>    PRIORITY:=1
>  endef
> 
> diff --git a/target/linux/cns3xxx/Makefile b/target/linux/cns3xxx/Makefile
> index 4df77967bf6c..04df322b64c9 100644
> --- a/target/linux/cns3xxx/Makefile
> +++ b/target/linux/cns3xxx/Makefile
> @@ -23,6 +23,6 @@ include $(INCLUDE_DIR)/target.mk
> 
>  KERNELNAME:=zImage
> 
> -DEFAULT_PACKAGES += kmod-ath9k kmod-usb2 wpad-basic
> +DEFAULT_PACKAGES += kmod-ath9k kmod-usb2 wpad-basic-wolfssl
> 
>  $(eval $(call BuildTarget))
> diff --git a/target/linux/ipq40xx/Makefile b/target/linux/ipq40xx/Makefile
> index 94b47c4c96de..4d9b2debcaed 100644
> --- a/target/linux/ipq40xx/Makefile
> +++ b/target/linux/ipq40xx/Makefile
> @@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/target.mk
>  DEFAULT_PACKAGES += \
>  	kmod-usb-dwc3-qcom \
>  	kmod-leds-gpio kmod-gpio-button-hotplug swconfig \
> -	kmod-ath10k-ct wpad-basic \
> +	kmod-ath10k-ct wpad-basic-wolfssl \
>  	kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019-ct
> 
>  $(eval $(call BuildTarget))
> diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile
> index 98ea35e0a6fa..bd85730d7f6a 100644
> --- a/target/linux/ipq806x/Makefile
> +++ b/target/linux/ipq806x/Makefile
> @@ -20,7 +20,7 @@ DEFAULT_PACKAGES += \
>  	kmod-ata-ahci kmod-ata-ahci-platform \
>  	kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \
>  	kmod-usb-phy-qcom-dwc3 kmod-usb3 kmod-usb-dwc3-qcom \
> -	kmod-ath10k-ct wpad-basic \
> +	kmod-ath10k-ct wpad-basic-wolfssl \
>  	uboot-envtools
> 
>  $(eval $(call BuildTarget))
> diff --git a/target/linux/kirkwood/image/Makefile
> b/target/linux/kirkwood/image/Makefile
> index ba93fffeb216..4b5ceef94182 100644
> --- a/target/linux/kirkwood/image/Makefile
> +++ b/target/linux/kirkwood/image/Makefile
> @@ -33,7 +33,7 @@ define Device/checkpoint_l-50
>    DEVICE_MODEL := L-50
>    DEVICE_DTS := kirkwood-l-50
>    DEVICE_PACKAGES := kmod-ath9k kmod-gpio-button-hotplug kmod-
> mvsdio \
> -	kmod-rtc-s35390a kmod-usb-ledtrig-usbport wpad-basic
> +	kmod-rtc-s35390a kmod-usb-ledtrig-usbport wpad-basic-wolfssl
>    IMAGES := sysupgrade.bin
>  endef
>  TARGET_DEVICES += checkpoint_l-50
> @@ -94,7 +94,7 @@ TARGET_DEVICES += iom_ix2-200
>  define Device/linksys_audi
>    DEVICE_VENDOR := Linksys
>    DEVICE_MODEL := EA3500 (Audi)
> -  DEVICE_PACKAGES := kmod-mwl8k wpad-basic kmod-gpio-button-hotplug
> +  DEVICE_PACKAGES := kmod-mwl8k wpad-basic-wolfssl kmod-gpio-button-
> hotplug
>    PAGESIZE := 512
>    SUBPAGESIZE := 256
>    BLOCKSIZE := 16k
> @@ -109,7 +109,7 @@ TARGET_DEVICES += linksys_audi
>  define Device/linksys_viper
>    DEVICE_VENDOR := Linksys
>    DEVICE_MODEL := E4200v2 / EA4500 (Viper)
> -  DEVICE_PACKAGES := kmod-mwl8k wpad-basic kmod-gpio-button-hotplug
> +  DEVICE_PACKAGES := kmod-mwl8k wpad-basic-wolfssl kmod-gpio-button-
> hotplug
>    KERNEL_SIZE := 2688k
>    KERNEL_IN_UBI :=
>    UBINIZE_OPTS := -E 5
> diff --git a/target/linux/kirkwood/profiles/00-default.mk
> b/target/linux/kirkwood/profiles/00-default.mk
> index bfc2154c4877..4bad7d668124 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 wpad-basic
> +	PACKAGES:=kmod-mwl8k wpad-basic-wolfssl
>  	PRIORITY:=1
>  endef
> 
> diff --git a/target/linux/lantiq/image/ar9.mk
> b/target/linux/lantiq/image/ar9.mk
> index 7a8f05ea58f9..ad061b27762b 100644
> --- a/target/linux/lantiq/image/ar9.mk
> +++ b/target/linux/lantiq/image/ar9.mk
> @@ -3,7 +3,7 @@ define Device/avm_fritz7312
>    DEVICE_MODEL := FRITZ!Box 7312
>    SOC := ar9
>    IMAGE_SIZE := 15744k
> -  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \
> +  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-wolfssl \
>  	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 \
> @@ -18,7 +18,7 @@ define Device/avm_fritz7320
>    DEVICE_ALT0_MODEL := HomeServer
>    SOC := ar9
>    IMAGE_SIZE := 15744k
> -  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \
> +  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-wolfssl \
>  	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 \
> @@ -39,7 +39,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-basic \
> +	kmod-ath9k kmod-owl-loader wpad-basic-wolfssl \
>  	uboot-envtools
>    SUPPORTED_DEVICES += BTHOMEHUBV3A
>  endef
> @@ -56,7 +56,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-basic
> +	kmod-ath9k kmod-owl-loader wpad-basic-wolfssl
>    SUPPORTED_DEVICES := WBMR buffalo,wbmr-hp-g300h
>  endef
>  TARGET_DEVICES += buffalo_wbmr-hp-g300h-a
> @@ -72,7 +72,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-basic
> +	kmod-ath9k kmod-owl-loader wpad-basic-wolfssl
>    SUPPORTED_DEVICES := WBMR buffalo,wbmr-hp-g300h
>  endef
>  TARGET_DEVICES += buffalo_wbmr-hp-g300h-b
> @@ -102,7 +102,7 @@ define Device/netgear_dgn3500
>  	dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "WW" |
> pad-rootfs | \
>  	check-size 16320k | pad-to 16384k
>    DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
> -	kmod-ath9k kmod-owl-loader wpad-basic \
> +	kmod-ath9k kmod-owl-loader wpad-basic-wolfssl \
>  	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 \
> @@ -125,7 +125,7 @@ define Device/netgear_dgn3500b
>  	dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "DE" |
> pad-rootfs | \
>  	check-size 16320k | pad-to 16384k
>    DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
> -	kmod-ath9k kmod-owl-loader wpad-basic \
> +	kmod-ath9k kmod-owl-loader wpad-basic-wolfssl \
>  	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 \
> @@ -139,7 +139,7 @@ define Device/zte_h201l
>    DEVICE_MODEL := H201L
>    IMAGE_SIZE := 7808k
>    SOC := ar9
> -  DEVICE_PACKAGES := kmod-ath9k-htc wpad-basic \
> +  DEVICE_PACKAGES := kmod-ath9k-htc wpad-basic-wolfssl \
>  	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 \
> @@ -155,7 +155,7 @@ define Device/zyxel_p-2601hn
>    DEVICE_VARIANT := F1/F3
>    IMAGE_SIZE := 15616k
>    SOC := ar9
> -  DEVICE_PACKAGES := kmod-rt2800-usb wpad-basic \
> +  DEVICE_PACKAGES := kmod-rt2800-usb wpad-basic-wolfssl \
>  	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 \
> diff --git a/target/linux/lantiq/image/danube.mk
> b/target/linux/lantiq/image/danube.mk
> index 2fb5ea061f90..6f9ffbb98aa6 100644
> --- a/target/linux/lantiq/image/danube.mk
> +++ b/target/linux/lantiq/image/danube.mk
> @@ -10,7 +10,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-basic
> +	kmod-rt2800-pci kmod-ath5k wpad-basic-wolfssl
>    SUPPORTED_DEVICES += ARV4510PW
>  endef
>  TARGET_DEVICES += arcadyan_arv4510pw
> @@ -42,7 +42,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-basic
> +	kmod-rt2800-pci wpad-basic-wolfssl
>    SUPPORTED_DEVICES += ARV7506PW11
>  endef
>  TARGET_DEVICES += arcadyan_arv7506pw11
> @@ -59,7 +59,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-basic \
> +	kmod-rt2800-pci wpad-basic-wolfssl \
>  	kmod-usb-uhci kmod-usb2 kmod-usb2-pci
>    SUPPORTED_DEVICES += ARV7510PW22
>  endef
> @@ -76,7 +76,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-basic
> +	kmod-ath9k kmod-owl-loader wpad-basic-wolfssl
>    SUPPORTED_DEVICES += ARV7518PW
>  endef
>  TARGET_DEVICES += arcadyan_arv7518pw
> @@ -92,7 +92,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-basic
> +	kmod-rt2800-pci wpad-basic-wolfssl
>    SUPPORTED_DEVICES += ARV7519PW
>  endef
>  TARGET_DEVICES += arcadyan_arv7519pw
> @@ -105,7 +105,7 @@ define Device/arcadyan_arv7525pw
>    DEVICE_ALT0_VARIANT := Typ A
>    IMAGE_SIZE := 3776k
>    SOC := danube
> -  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic \
> +  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-wolfssl \
>  	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
> @@ -125,7 +125,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-basic
> +	kmod-rt2800-pci wpad-basic-wolfssl
>    SUPPORTED_DEVICES += ARV752DPW
>  endef
>  TARGET_DEVICES += arcadyan_arv752dpw
> @@ -142,7 +142,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-basic
> +	kmod-rt2800-pci wpad-basic-wolfssl
>    SUPPORTED_DEVICES += ARV752DPW22
>  endef
>  TARGET_DEVICES += arcadyan_arv752dpw22
> @@ -158,7 +158,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-basic
> +	kmod-ath9k kmod-owl-loader wpad-basic-wolfssl
>    SUPPORTED_DEVICES += ARV8539PW22
>  endef
>  TARGET_DEVICES += arcadyan_arv8539pw22
> @@ -174,7 +174,7 @@ define Device/audiocodes_mp-252
>  	kmod-usb-ledtrig-usbport kmod-usb-dwc2 \
>  	kmod-rt2800-pci \
>  	ltq-adsl-app ppp-mod-pppoa \
> -	wpad-basic
> +	wpad-basic-wolfssl
>    SUPPORTED_DEVICES += ACMP252
>  endef
>  TARGET_DEVICES += audiocodes_mp-252
> @@ -191,7 +191,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-basic
> +	kmod-ath9k kmod-owl-loader wpad-basic-wolfssl
>    SUPPORTED_DEVICES += BTHOMEHUBV2B
>  endef
>  TARGET_DEVICES += bt_homehub-v2b
> @@ -213,7 +213,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-basic
> +	kmod-ath5k wpad-basic-wolfssl
>    SUPPORTED_DEVICES += GIGASX76X
>  endef
>  TARGET_DEVICES += siemens_gigaset-sx76x
> diff --git a/target/linux/lantiq/image/tp-link.mk
> b/target/linux/lantiq/image/tp-link.mk
> index 2f9fa7b97fb7..cebdf46e1296 100644
> --- a/target/linux/lantiq/image/tp-link.mk
> +++ b/target/linux/lantiq/image/tp-link.mk
> @@ -20,7 +20,7 @@ define Device/tplink_tdw8970
>    TPLINK_HWID := 0x89700001
>    TPLINK_HWREV := 1
>    IMAGE_SIZE := 7680k
> -  DEVICE_PACKAGES:= kmod-ath9k wpad-basic kmod-usb-dwc2 kmod-usb-
> ledtrig-usbport
> +  DEVICE_PACKAGES:= kmod-ath9k wpad-basic-wolfssl kmod-usb-dwc2
> kmod-usb-ledtrig-usbport
>    SUPPORTED_DEVICES += TDW8970
>  endef
>  TARGET_DEVICES += tplink_tdw8970
> @@ -33,7 +33,7 @@ define Device/tplink_tdw8980
>    TPLINK_HWID := 0x89800001
>    TPLINK_HWREV := 14
>    IMAGE_SIZE := 7680k
> -  DEVICE_PACKAGES:= kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-
> dwc2 kmod-usb-ledtrig-usbport
> +  DEVICE_PACKAGES:= kmod-ath9k kmod-owl-loader wpad-basic-wolfssl
> kmod-usb-dwc2 kmod-usb-ledtrig-usbport
>    SUPPORTED_DEVICES += TDW8980
>  endef
>  TARGET_DEVICES += tplink_tdw8980
> @@ -46,7 +46,7 @@ define Device/tplink_vr200
>    TPLINK_HWID := 0x63e64801
>    TPLINK_HWREV := 0x53
>    IMAGE_SIZE := 15808k
> -  DEVICE_PACKAGES:= kmod-mt76x0e wpad-basic kmod-usb-dwc2 kmod-
> usb-ledtrig-usbport
> +  DEVICE_PACKAGES:= kmod-mt76x0e wpad-basic-wolfssl kmod-usb-dwc2
> kmod-usb-ledtrig-usbport
>    SUPPORTED_DEVICES += VR200
>  endef
>  TARGET_DEVICES += tplink_vr200
> @@ -59,7 +59,7 @@ define Device/tplink_vr200v
>    TPLINK_HWID := 0x73b70801
>    TPLINK_HWREV := 0x2f
>    IMAGE_SIZE := 15808k
> -  DEVICE_PACKAGES:= kmod-mt76x0e wpad-basic kmod-usb-dwc2 kmod-
> usb-ledtrig-usbport kmod-ltq-tapi kmod-ltq-vmmc
> +  DEVICE_PACKAGES:= kmod-mt76x0e wpad-basic-wolfssl kmod-usb-dwc2
> kmod-usb-ledtrig-usbport kmod-ltq-tapi kmod-ltq-vmmc
>    SUPPORTED_DEVICES += VR200v
>  endef
>  TARGET_DEVICES += tplink_vr200v
> diff --git a/target/linux/lantiq/image/vr9.mk
> b/target/linux/lantiq/image/vr9.mk
> index 42671010724e..e5ebbd3b65bc 100644
> --- a/target/linux/lantiq/image/vr9.mk
> +++ b/target/linux/lantiq/image/vr9.mk
> @@ -43,7 +43,7 @@ define Device/arcadyan_vgv7510kw22-brn
>    SIGNATURE := BRNDA6431
>    MAGIC := 0x12345678
>    CRC32_POLY := 0x04c11db7
> -  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-
> ltq-tapi kmod-ltq-vmmc
> +  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-wolfssl kmod-usb-
> dwc2 kmod-ltq-tapi kmod-ltq-vmmc
>    SUPPORTED_DEVICES += VGV7510KW22BRN
>  endef
>  TARGET_DEVICES += arcadyan_vgv7510kw22-brn
> @@ -56,7 +56,7 @@ define Device/arcadyan_vgv7510kw22-nor
>    DEVICE_ALT0_MODEL := Box 6431
>    DEVICE_ALT0_VARIANT := NOR
>    IMAGE_SIZE := 15232k
> -  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-
> ltq-tapi kmod-ltq-vmmc
> +  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-wolfssl kmod-usb-
> dwc2 kmod-ltq-tapi kmod-ltq-vmmc
>    SUPPORTED_DEVICES += VGV7510KW22NOR
>  endef
>  TARGET_DEVICES += arcadyan_vgv7510kw22-nor
> @@ -73,7 +73,7 @@ define Device/arcadyan_vgv7519-brn
>    SIGNATURE := 5D00008000
>    MAGIC := 0x12345678
>    CRC32_POLY := 0x2083b8ed
> -  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-
> ltq-tapi kmod-ltq-vmmc
> +  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-wolfssl kmod-usb-
> dwc2 kmod-ltq-tapi kmod-ltq-vmmc
>    SUPPORTED_DEVICES += VGV7519BRN
>  endef
>  TARGET_DEVICES += arcadyan_vgv7519-brn
> @@ -86,7 +86,7 @@ define Device/arcadyan_vgv7519-nor
>    DEVICE_ALT0_MODEL := Experiabox 8
>    DEVICE_ALT0_VARIANT := NOR
>    IMAGE_SIZE := 15360k
> -  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-
> ltq-tapi kmod-ltq-vmmc
> +  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-wolfssl kmod-usb-
> dwc2 kmod-ltq-tapi kmod-ltq-vmmc
>    SUPPORTED_DEVICES += VGV7519NOR
>  endef
>  TARGET_DEVICES += arcadyan_vgv7519-nor
> @@ -101,7 +101,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-basic kmod-usb-dwc2 fritz-tffs
> +  DEVICE_PACKAGES := kmod-ath9k wpad-basic-wolfssl kmod-usb-dwc2
> fritz-tffs
>  endef
> 
>  define Device/avm_fritz3370-rev2-hynix
> @@ -122,7 +122,7 @@ define Device/avm_fritz7360sl
>    $(Device/AVM)
>    DEVICE_MODEL := FRITZ!Box 7360 SL
>    IMAGE_SIZE := 15744k
> -  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-
> usb-dwc2
> +  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-wolfssl
> kmod-usb-dwc2
>    SUPPORTED_DEVICES += FRITZ7360SL
>  endef
>  TARGET_DEVICES += avm_fritz7360sl
> @@ -132,7 +132,7 @@ define Device/avm_fritz7360-v2
>    DEVICE_MODEL := FRITZ!Box 7360
>    DEVICE_VARIANT := v2
>    IMAGE_SIZE := 32128k
> -  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-
> usb-dwc2
> +  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-wolfssl
> kmod-usb-dwc2
>  endef
>  TARGET_DEVICES += avm_fritz7360-v2
> 
> @@ -142,7 +142,7 @@ define Device/avm_fritz7362sl
>    DEVICE_MODEL := FRITZ!Box 7362 SL
>    KERNEL_SIZE := 4096k
>    IMAGE_SIZE := 49152k
> -  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-
> usb-dwc2 fritz-tffs
> +  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-wolfssl
> kmod-usb-dwc2 fritz-tffs
>  endef
>  TARGET_DEVICES += avm_fritz7362sl
> 
> @@ -153,7 +153,7 @@ define Device/avm_fritz7412
>    BOARD_NAME := FRITZ7412
>    KERNEL_SIZE := 4096k
>    IMAGE_SIZE := 49152k
> -  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic fritz-tffs-
> nand fritz-caldata
> +  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-wolfssl
> fritz-tffs-nand fritz-caldata
>  endef
>  TARGET_DEVICES += avm_fritz7412
> 
> @@ -164,7 +164,7 @@ define Device/bt_homehub-v5a
>    DEVICE_VARIANT := Type A
>    BOARD_NAME := BTHOMEHUBV5A
>    DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader \
> -	kmod-ath10k-ct ath10k-firmware-qca988x-ct wpad-basic kmod-usb-
> dwc2
> +	kmod-ath10k-ct ath10k-firmware-qca988x-ct wpad-basic-wolfssl
> kmod-usb-dwc2
>    SUPPORTED_DEVICES += BTHOMEHUBV5A
>  endef
>  TARGET_DEVICES += bt_homehub-v5a
> @@ -173,7 +173,7 @@ define Device/buffalo_wbmr-300hpd
>    DEVICE_VENDOR := Buffalo
>    DEVICE_MODEL := WBMR-300HPD
>    IMAGE_SIZE := 15616k
> -  DEVICE_PACKAGES := kmod-mt7603 wpad-basic kmod-usb-dwc2
> +  DEVICE_PACKAGES := kmod-mt7603 wpad-basic-wolfssl kmod-usb-dwc2
>    SUPPORTED_DEVICES += WBMR300
>  endef
>  TARGET_DEVICES += buffalo_wbmr-300hpd
> @@ -184,7 +184,7 @@ define Device/lantiq_easy80920-nand
>    DEVICE_MODEL := VR9 EASY80920
>    DEVICE_VARIANT := NAND
>    IMAGE_SIZE := 64512k
> -  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-
> usb-dwc2 kmod-usb-ledtrig-usbport
> +  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-wolfssl
> kmod-usb-dwc2 kmod-usb-ledtrig-usbport
>  endef
>  TARGET_DEVICES += lantiq_easy80920-nand
> 
> @@ -193,7 +193,7 @@ define Device/lantiq_easy80920-nor
>    DEVICE_MODEL := VR9 EASY80920
>    DEVICE_VARIANT := NOR
>    IMAGE_SIZE := 7936k
> -  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-
> usb-dwc2 kmod-usb-ledtrig-usbport
> +  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-wolfssl
> kmod-usb-dwc2 kmod-usb-ledtrig-usbport
>  endef
>  TARGET_DEVICES += lantiq_easy80920-nor
> 
> @@ -218,7 +218,7 @@ define Device/zyxel_p-2812hnu-f1
>    DEVICE_MODEL := P-2812HNU
>    DEVICE_VARIANT := F1
>    BOARD_NAME := P2812HNUF1
> -  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-
> usb-ledtrig-usbport
> +  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-wolfssl kmod-usb-
> dwc2 kmod-usb-ledtrig-usbport
>    KERNEL_SIZE := 3072k
>    SUPPORTED_DEVICES += P2812HNUF1
>  endef
> @@ -230,7 +230,7 @@ define Device/zyxel_p-2812hnu-f3
>    DEVICE_MODEL := P-2812HNU
>    DEVICE_VARIANT := F3
>    BOARD_NAME := P2812HNUF3
> -  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2
> +  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-wolfssl kmod-usb-
> dwc2
>    SUPPORTED_DEVICES += P2812HNUF3
>  endef
>  TARGET_DEVICES += zyxel_p-2812hnu-f3
> diff --git a/target/linux/lantiq/image/xway_legacy.mk
> b/target/linux/lantiq/image/xway_legacy.mk
> index 52a29ab2f0ee..885e62863f1f 100644
> --- a/target/linux/lantiq/image/xway_legacy.mk
> +++ b/target/linux/lantiq/image/xway_legacy.mk
> @@ -6,7 +6,7 @@ define Device/arcadyan_arv4518pwr01
>  	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-wolfssl
>    SUPPORTED_DEVICES += ARV4518PWR01
>  endef
>  TARGET_DEVICES += arcadyan_arv4518pwr01
> @@ -19,7 +19,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-basic
> +	kmod-ath5k wpad-basic-wolfssl
>    SUPPORTED_DEVICES += ARV4518PWR01A
>  endef
>  TARGET_DEVICES += arcadyan_arv4518pwr01a
> @@ -36,7 +36,7 @@ define Device/arcadyan_arv4520pw
>  	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-rt61-pci wpad-mini
> +	kmod-rt61-pci wpad-basic-wolfssl
>    SUPPORTED_DEVICES += ARV4520PW
>  endef
>  TARGET_DEVICES += arcadyan_arv4520pw
> @@ -48,7 +48,7 @@ define Device/arcadyan_arv4525pw
>    DEVICE_ALT0_MODEL := Speedport W502V
>    DEVICE_ALT0_VARIANT := Typ A
>    IMAGE_SIZE := 3776k
> -  DEVICE_PACKAGES := kmod-ath5k wpad-mini \
> +  DEVICE_PACKAGES := kmod-ath5k wpad-basic-wolfssl \
>  	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
> @@ -63,7 +63,7 @@ define Device/arcadyan_arv452cqw
>    DEVICE_ALT0_MODEL := Easybox 801
>    IMAGE_SIZE := 3776k
>    DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
> -	kmod-ath5k wpad-mini \
> +	kmod-ath5k wpad-basic-wolfssl \
>  	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
> diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile
> index 3a1f50b77f89..3f2c92c766ad 100644
> --- a/target/linux/malta/Makefile
> +++ b/target/linux/malta/Makefile
> @@ -17,6 +17,6 @@ KERNEL_PATCHVER:=5.4
> 
>  include $(INCLUDE_DIR)/target.mk
> 
> -DEFAULT_PACKAGES += wpad-basic kmod-mac80211-hwsim kmod-pcnet32
> mkf2fs e2fsprogs
> +DEFAULT_PACKAGES += wpad-basic-wolfssl kmod-mac80211-hwsim kmod-
> pcnet32 mkf2fs e2fsprogs
> 
>  $(eval $(call BuildTarget))
> diff --git a/target/linux/mediatek/mt7622/target.mk
> b/target/linux/mediatek/mt7622/target.mk
> index dd4459724e9b..cb5a6b48cd9b 100644
> --- a/target/linux/mediatek/mt7622/target.mk
> +++ b/target/linux/mediatek/mt7622/target.mk
> @@ -2,7 +2,7 @@ ARCH:=aarch64
>  SUBTARGET:=mt7622
>  BOARDNAME:=MT7622
>  CPU_TYPE:=cortex-a53
> -DEFAULT_PACKAGES += kmod-mt7615e kmod-mt7615-firmware wpad-basic
> +DEFAULT_PACKAGES += kmod-mt7615e kmod-mt7615-firmware wpad-
> basic-wolfssl
>  KERNELNAME:=Image dtbs
> 
>  define Target/Description
> diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile
> index 2ffdfeddcd98..94384a8866a1 100644
> --- a/target/linux/mpc85xx/Makefile
> +++ b/target/linux/mpc85xx/Makefile
> @@ -21,6 +21,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-basic kmod-usb2
> +	kmod-leds-gpio swconfig kmod-ath9k wpad-basic-wolfssl kmod-usb2
> 
>  $(eval $(call BuildTarget))
> diff --git a/target/linux/mvebu/image/cortexa9.mk
> b/target/linux/mvebu/image/cortexa9.mk
> index 6ab4e6abc1cf..08ea5b3b6ae2 100644
> --- a/target/linux/mvebu/image/cortexa9.mk
> +++ b/target/linux/mvebu/image/cortexa9.mk
> @@ -31,7 +31,7 @@ define Device/cznic_turris-omnia
>    KERNEL_INITRAMFS := kernel-bin
>    DEVICE_PACKAGES :=  \
>      mkf2fs e2fsprogs kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \
> -    wpad-basic kmod-ath9k kmod-ath10k-ct ath10k-firmware-qca988x-ct \
> +    wpad-basic-wolfssl kmod-ath9k kmod-ath10k-ct ath10k-firmware-
> qca988x-ct \
>      partx-utils kmod-i2c-mux-pca954x
>    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
> @@ -68,7 +68,7 @@ TARGET_DEVICES += kobol_helios4
>  define Device/linksys
>    $(Device/NAND-128K)
>    DEVICE_VENDOR := Linksys
> -  DEVICE_PACKAGES := kmod-mwlwifi wpad-basic
> +  DEVICE_PACKAGES := kmod-mwlwifi wpad-basic-wolfssl
>    IMAGES += factory.img
>    IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | \
>  	append-ubi | pad-to $$$$(PAGESIZE)
> diff --git a/target/linux/omap/profiles/00-default.mk
> b/target/linux/omap/profiles/00-default.mk
> index 37c0761029f1..fd7e441c3daf 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-basic
> +	wpad-basic-wolfssl
>    PRIORITY := 1
>  endef
> 
> diff --git a/target/linux/oxnas/image/ox820.mk
> b/target/linux/oxnas/image/ox820.mk
> index 2a9295bd9719..f00cfe86080e 100644
> --- a/target/linux/oxnas/image/ox820.mk
> +++ b/target/linux/oxnas/image/ox820.mk
> @@ -51,7 +51,7 @@ define Device/cloudengines_pogoplugpro
>    DEVICE_MODEL := PogoPlug Pro (with mPCIe)
>    SUPPORTED_DEVICES += pogoplug-pro
>    DEVICE_PACKAGES := kmod-usb2-oxnas kmod-usb-ledtrig-usbport \
> -	kmod-ata-oxnas-sata kmod-rt2800-pci wpad-basic
> +	kmod-ata-oxnas-sata kmod-rt2800-pci wpad-basic-wolfssl
>  endef
>  TARGET_DEVICES += cloudengines_pogoplugpro
> 
> diff --git a/target/linux/ramips/image/mt7620.mk
> b/target/linux/ramips/image/mt7620.mk
> index 34e2e42c330a..d7c255591063 100644
> --- a/target/linux/ramips/image/mt7620.mk
> +++ b/target/linux/ramips/image/mt7620.mk
> @@ -52,7 +52,7 @@ define Device/alfa-network_tube-e4g
>    DEVICE_VENDOR := ALFA Network
>    DEVICE_MODEL := Tube-E4G
>    DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci uboot-envtools uqmi -
> iwinfo \
> -	-kmod-rt2800-soc -wpad-basic
> +	-kmod-rt2800-soc -wpad-basic-wolfssl
>  endef
>  TARGET_DEVICES += alfa-network_tube-e4g
> 
> diff --git a/target/linux/ramips/image/mt7621.mk
> b/target/linux/ramips/image/mt7621.mk
> index 0315822c0b05..06029e709392 100644
> --- a/target/linux/ramips/image/mt7621.mk
> +++ b/target/linux/ramips/image/mt7621.mk
> @@ -109,7 +109,7 @@ define Device/adslr_g7
>    IMAGE_SIZE := 16064k
>    DEVICE_VENDOR := ADSLR
>    DEVICE_MODEL := G7
> -  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-
> wolfssl
>  endef
>  TARGET_DEVICES += adslr_g7
> 
> @@ -118,7 +118,7 @@ define Device/afoundry_ew1200
>    DEVICE_VENDOR := AFOUNDRY
>    DEVICE_MODEL := EW1200
>    DEVICE_PACKAGES := kmod-ata-ahci kmod-mt76x2 kmod-mt7603 kmod-
> usb3 \
> -	kmod-usb-ledtrig-usbport wpad-basic
> +	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
>    SUPPORTED_DEVICES += ew1200
>  endef
>  TARGET_DEVICES += afoundry_ew1200
> @@ -152,7 +152,7 @@ define Device/asus_rt-ac57u
>    DEVICE_MODEL := RT-AC57U
>    IMAGE_SIZE := 16064k
>    DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
> -	kmod-usb-ledtrig-usbport wpad-basic
> +	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
>  endef
>  TARGET_DEVICES += asus_rt-ac57u
> 
> @@ -168,7 +168,7 @@ define Device/asus_rt-ac65p
>    IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
>    IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-
> ubi | \
>  	check-size
> -  DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware
> wpad-basic uboot-envtools
> +  DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware
> wpad-basic-wolfssl uboot-envtools
>  endef
>  TARGET_DEVICES += asus_rt-ac65p
> 
> @@ -184,7 +184,7 @@ define Device/asus_rt-ac85p
>    IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
>    IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-
> ubi | \
>  	check-size
> -  DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware
> wpad-basic uboot-envtools
> +  DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware
> wpad-basic-wolfssl uboot-envtools
>  endef
>  TARGET_DEVICES += asus_rt-ac85p
> 
> @@ -194,7 +194,7 @@ define Device/buffalo_wsr-1166dhp
>    IMAGE_SIZE := 15936k
>    DEVICE_VENDOR := Buffalo
>    DEVICE_MODEL := WSR-1166DHP
> -  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic-wolfssl
>    SUPPORTED_DEVICES += wsr-1166
>  endef
>  TARGET_DEVICES += buffalo_wsr-1166dhp
> @@ -207,7 +207,7 @@ define Device/buffalo_wsr-2533dhpl
>    DEVICE_ALT0_VENDOR := Buffalo
>    DEVICE_ALT0_MODEL := WSR-2533DHP
>    IMAGE/sysupgrade.bin := trx | pad-rootfs | append-metadata
> -  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-
> wolfssl
>  endef
>  TARGET_DEVICES += buffalo_wsr-2533dhpl
> 
> @@ -215,7 +215,7 @@ define Device/buffalo_wsr-600dhp
>    IMAGE_SIZE := 16064k
>    DEVICE_VENDOR := Buffalo
>    DEVICE_MODEL := WSR-600DHP
> -  DEVICE_PACKAGES := kmod-mt7603 kmod-rt2800-pci wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7603 kmod-rt2800-pci wpad-basic-wolfssl
>    SUPPORTED_DEVICES += wsr-600
>  endef
>  TARGET_DEVICES += buffalo_wsr-600dhp
> @@ -223,7 +223,7 @@ TARGET_DEVICES += buffalo_wsr-600dhp
>  define Device/dlink_dir-8xx-a1
>    IMAGE_SIZE := 16000k
>    DEVICE_VENDOR := D-Link
> -  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-
> wolfssl
>    KERNEL_INITRAMFS := $$(KERNEL) | uimage-padhdr 96
>    IMAGES += factory.bin
>    IMAGE/sysupgrade.bin := append-kernel | append-rootfs | uimage-padhdr
> 96 |\
> @@ -243,7 +243,7 @@ define Device/dlink_dir-860l-b1
>    DEVICE_VENDOR := D-Link
>    DEVICE_MODEL := DIR-860L
>    DEVICE_VARIANT := B1
> -  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport
> wpad-basic
> +  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport
> wpad-basic-wolfssl
>    SUPPORTED_DEVICES += dir-860l-b1
>  endef
>  TARGET_DEVICES += dlink_dir-860l-b1
> @@ -276,7 +276,7 @@ define Device/d-team_newifi-d2
>    DEVICE_VENDOR := Newifi
>    DEVICE_MODEL := D2
>    DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
> -	kmod-usb-ledtrig-usbport wpad-basic
> +	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
>  endef
>  TARGET_DEVICES += d-team_newifi-d2
> 
> @@ -285,7 +285,7 @@ define Device/d-team_pbr-m1
>    DEVICE_VENDOR := PandoraBox
>    DEVICE_MODEL := PBR-M1
>    DEVICE_PACKAGES := kmod-ata-ahci kmod-mt7603 kmod-mt76x2 kmod-
> sdhci-mt7620 \
> -	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
> +	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic-wolfssl
>    SUPPORTED_DEVICES += pbr-m1
>  endef
>  TARGET_DEVICES += d-team_pbr-m1
> @@ -300,7 +300,7 @@ define Device/edimax_ra21s
>    IMAGES += factory.bin
>    IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \
>  	elx-header 02020040 8844A2D168B45A2D
> -  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-
> wolfssl
>  endef
>  TARGET_DEVICES += edimax_ra21s
> 
> @@ -318,7 +318,7 @@ define Device/edimax_re23s
>    IMAGE/factory.bin := append-kernel | append-rootfs | \
>  	edimax-header -s CSYS -m RN76 -f 0x70000 -S 0x01100000 | pad-
> rootfs | \
>  	check-size
> -  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-
> wolfssl
>  endef
>  TARGET_DEVICES += edimax_re23s
> 
> @@ -330,7 +330,7 @@ define Device/edimax_rg21s
>    IMAGES += factory.bin
>    IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \
>  	elx-header 02020038 8844A2D168B45A2D
> -  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-
> wolfssl
>  endef
>  TARGET_DEVICES += edimax_rg21s
> 
> @@ -341,7 +341,7 @@ define Device/elecom_wrc-1167ghbk2-s
>    IMAGES += factory.bin
>    IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \
>  	elecom-wrc-factory WRC-1167GHBK2-S 0.00
> -  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-
> wolfssl
>  endef
>  TARGET_DEVICES += elecom_wrc-1167ghbk2-s
> 
> @@ -351,7 +351,7 @@ define Device/elecom_wrc-gs
>    IMAGES += factory.bin
>    IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \
>  	elecom-wrc-gs-factory $$$$(ELECOM_HWNAME) 0.00
> -  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-
> wolfssl
>  endef
> 
>  define Device/elecom_wrc-1750gs
> @@ -398,7 +398,7 @@ define Device/firefly_firewrt
>    IMAGE_SIZE := 16064k
>    DEVICE_VENDOR := Firefly
>    DEVICE_MODEL := FireWRT
> -  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport
> wpad-basic
> +  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport
> wpad-basic-wolfssl
>    SUPPORTED_DEVICES += firewrt
>  endef
>  TARGET_DEVICES += firefly_firewrt
> @@ -408,7 +408,7 @@ define Device/gehua_ghl-r-001
>    DEVICE_VENDOR := GeHua
>    DEVICE_MODEL := GHL-R-001
>    DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
> -	kmod-usb-ledtrig-usbport wpad-basic
> +	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
>  endef
>  TARGET_DEVICES += gehua_ghl-r-001
> 
> @@ -440,7 +440,7 @@ define Device/hiwifi_hc5962
>  	check-size
>    DEVICE_VENDOR := HiWiFi
>    DEVICE_MODEL := HC5962
> -  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 wpad-
> basic-wolfssl
>  endef
>  TARGET_DEVICES += hiwifi_hc5962
> 
> @@ -451,7 +451,7 @@ define Device/iodata_wn-ax1167gr
>  	iodata-factory 7864320 4 0x1055
> $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.bin
>    DEVICE_VENDOR := I-O DATA
>    DEVICE_MODEL := WN-AX1167GR
> -  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic-wolfssl
>  endef
>  TARGET_DEVICES += iodata_wn-ax1167gr
> 
> @@ -473,7 +473,7 @@ define Device/iodata_wn-ax1167gr2
>    DEVICE_MODEL := WN-AX1167GR2
>    KERNEL_INITRAMFS := $(KERNEL_DTB) | loader-kernel | lzma | \
>  	custom-initramfs-uimage 3.10(XBC.1)b10 | iodata-mstc-header
> -  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-
> wolfssl
>  endef
>  TARGET_DEVICES += iodata_wn-ax1167gr2
> 
> @@ -483,7 +483,7 @@ define Device/iodata_wn-ax2033gr
>    DEVICE_MODEL := WN-AX2033GR
>    KERNEL_INITRAMFS := $(KERNEL_DTB) | loader-kernel | lzma | \
>  	custom-initramfs-uimage 3.10(VST.1)C10 | iodata-mstc-header
> -  DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7615-
> firmware wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7615-
> firmware wpad-basic-wolfssl
>  endef
>  TARGET_DEVICES += iodata_wn-ax2033gr
> 
> @@ -493,7 +493,7 @@ define Device/iodata_wn-dx1167r
>    DEVICE_MODEL := WN-DX1167R
>    KERNEL_INITRAMFS := $(KERNEL_DTB) | loader-kernel | lzma | \
>  	custom-initramfs-uimage 3.10(XIK.1)b10 | iodata-mstc-header
> -  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-
> wolfssl
>  endef
>  TARGET_DEVICES += iodata_wn-dx1167r
> 
> @@ -502,7 +502,7 @@ define Device/iodata_wn-gx300gr
>    IMAGE_SIZE := 7616k
>    DEVICE_VENDOR := I-O DATA
>    DEVICE_MODEL := WN-GX300GR
> -  DEVICE_PACKAGES := kmod-mt7603 wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7603 wpad-basic-wolfssl
>  endef
>  TARGET_DEVICES += iodata_wn-gx300gr
> 
> @@ -514,7 +514,7 @@ define Device/iodata_wnpr2600g
>    IMAGES += factory.bin
>    IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \
>  	elx-header 0104003a 8844A2D168B45A2D
> -  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-
> wolfssl
>  endef
>  TARGET_DEVICES += iodata_wnpr2600g
> 
> @@ -523,7 +523,7 @@ define Device/iptime_a6ns-m
>    UIMAGE_NAME := a6nm
>    DEVICE_VENDOR := ipTIME
>    DEVICE_MODEL := A6ns-M
> -  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3
> kmod-usb-ledtrig-usbport wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3
> kmod-usb-ledtrig-usbport wpad-basic-wolfssl
>  endef
>  TARGET_DEVICES += iptime_a6ns-m
> 
> @@ -532,7 +532,7 @@ define Device/iptime_a8004t
>    UIMAGE_NAME := a8004t
>    DEVICE_VENDOR := ipTIME
>    DEVICE_MODEL := A8004T
> -  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3
> wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3
> wpad-basic-wolfssl
>  endef
>  TARGET_DEVICES += iptime_a8004t
> 
> @@ -543,7 +543,7 @@ define Device/jcg_jhr-ac876m
>    JCG_MAXSIZE := 16064k
>    DEVICE_VENDOR := JCG
>    DEVICE_MODEL := JHR-AC876M
> -  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3
> kmod-usb-ledtrig-usbport wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3
> kmod-usb-ledtrig-usbport wpad-basic-wolfssl
>  endef
>  TARGET_DEVICES += jcg_jhr-ac876m
> 
> @@ -553,7 +553,7 @@ define Device/lenovo_newifi-d1
>    DEVICE_VENDOR := Newifi
>    DEVICE_MODEL := D1
>    DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-sdhci-
> mt7620 \
> -	kmod-usb-ledtrig-usbport wpad-basic
> +	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
>    SUPPORTED_DEVICES += newifi-d1
>  endef
>  TARGET_DEVICES += lenovo_newifi-d1
> @@ -565,7 +565,7 @@ define Device/linksys_ea7xxx
>    KERNEL_SIZE := 4096k
>    IMAGE_SIZE := 36864k
>    DEVICE_VENDOR := Linksys
> -  DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware
> wpad-basic \
> +  DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware
> wpad-basic-wolfssl \
>  	uboot-envtools
>    UBINIZE_OPTS := -E 5
>    IMAGES := sysupgrade.bin factory.bin
> @@ -594,7 +594,7 @@ define Device/linksys_re6500
>    IMAGE_SIZE := 7872k
>    DEVICE_VENDOR := Linksys
>    DEVICE_MODEL := RE6500
> -  DEVICE_PACKAGES := kmod-mt76x2 wpad-basic
> +  DEVICE_PACKAGES := kmod-mt76x2 wpad-basic-wolfssl
>    SUPPORTED_DEVICES += re6500
>  endef
>  TARGET_DEVICES += linksys_re6500
> @@ -655,7 +655,7 @@ define Device/mqmaker_witi
>    DEVICE_VENDOR := MQmaker
>    DEVICE_MODEL := WiTi
>    DEVICE_PACKAGES := kmod-ata-ahci kmod-mt76x2 kmod-sdhci-mt7620
> kmod-usb3 \
> -	kmod-usb-ledtrig-usbport wpad-basic
> +	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
>    SUPPORTED_DEVICES += witi mqmaker,witi-256m mqmaker,witi-512m
>  endef
>  TARGET_DEVICES += mqmaker_witi
> @@ -666,14 +666,14 @@ define Device/mtc_wr1201
>    DEVICE_MODEL := Wireless Router WR1201
>    KERNEL_INITRAMFS := $(KERNEL_DTB) | custom-initramfs-uimage
> WR1201_8_128
>    DEVICE_PACKAGES := kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 \
> -	kmod-usb-ledtrig-usbport wpad-basic
> +	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
>  endef
>  TARGET_DEVICES += mtc_wr1201
> 
>  define Device/netgear_ex6150
>    DEVICE_VENDOR := NETGEAR
>    DEVICE_MODEL := EX6150
> -  DEVICE_PACKAGES := kmod-mt76x2 wpad-basic
> +  DEVICE_PACKAGES := kmod-mt76x2 wpad-basic-wolfssl
>    NETGEAR_BOARD_ID := U12H318T00_NETGEAR
>    IMAGE_SIZE := 14848k
>    IMAGES += factory.chk
> @@ -695,7 +695,7 @@ define Device/netgear_sercomm_nand
>    IMAGE/kernel.bin := append-kernel
>    IMAGE/rootfs.bin := append-ubi | check-size
>    DEVICE_VENDOR := NETGEAR
> -  DEVICE_PACKAGES := kmod-mt7603 kmod-usb3 kmod-usb-ledtrig-usbport
> wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7603 kmod-usb3 kmod-usb-ledtrig-usbport
> wpad-basic-wolfssl
>  endef
> 
>  define Device/netgear_r6220
> @@ -821,7 +821,7 @@ define Device/netgear_wndr3700-v5
>    DEVICE_MODEL := WNDR3700
>    DEVICE_VARIANT := v5
>    DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
> -	kmod-usb-ledtrig-usbport wpad-basic
> +	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
>    SUPPORTED_DEVICES += wndr3700v5
>  endef
>  TARGET_DEVICES += netgear_wndr3700-v5
> @@ -841,7 +841,7 @@ define Device/netis_wf2881
>  	check-size
>    DEVICE_VENDOR := NETIS
>    DEVICE_MODEL := WF2881
> -  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport
> wpad-basic
> +  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport
> wpad-basic-wolfssl
>  endef
>  TARGET_DEVICES += netis_wf2881
> 
> @@ -852,7 +852,7 @@ define Device/phicomm_k2p
>    DEVICE_ALT0_VENDOR := Phicomm
>    DEVICE_ALT0_MODEL := KE 2P
>    SUPPORTED_DEVICES += k2p
> -  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-
> wolfssl
>  endef
>  TARGET_DEVICES += phicomm_k2p
> 
> @@ -871,7 +871,7 @@ define Device/samknows_whitebox-v8
>    DEVICE_VENDOR := SamKnows
>    DEVICE_MODEL := Whitebox 8
>    DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
> -	kmod-usb-ledtrig-usbport uboot-envtools wpad-basic
> +	kmod-usb-ledtrig-usbport uboot-envtools wpad-basic-wolfssl
>    SUPPORTED_DEVICES += sk-wb8
>  endef
>  TARGET_DEVICES += samknows_whitebox-v8
> @@ -880,7 +880,7 @@ define Device/storylink_sap-g3200u3
>    IMAGE_SIZE := 7872k
>    DEVICE_VENDOR := STORYLiNK
>    DEVICE_MODEL := SAP-G3200U3
> -  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport
> wpad-basic
> +  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport
> wpad-basic-wolfssl
>    SUPPORTED_DEVICES += sap-g3200u3
>  endef
>  TARGET_DEVICES += storylink_sap-g3200u3
> @@ -889,7 +889,7 @@ define Device/telco-electronics_x1
>    IMAGE_SIZE := 16064k
>    DEVICE_VENDOR := Telco Electronics
>    DEVICE_MODEL := X1
> -  DEVICE_PACKAGES := kmod-usb3 kmod-mt76 wpad-basic
> +  DEVICE_PACKAGES := kmod-usb3 kmod-mt76 wpad-basic-wolfssl
>  endef
>  TARGET_DEVICES += telco-electronics_x1
> 
> @@ -908,7 +908,7 @@ define Device/totolink_a7000r
>    UIMAGE_NAME := C8340R1C-9999
>    DEVICE_VENDOR := TOTOLINK
>    DEVICE_MODEL := A7000R
> -  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-
> wolfssl
>  endef
>  TARGET_DEVICES += totolink_a7000r
> 
> @@ -916,7 +916,7 @@ define Device/tplink_re350-v1
>    $(Device/tplink-safeloader)
>    DEVICE_MODEL := RE350
>    DEVICE_VARIANT := v1
> -  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic-wolfssl
>    TPLINK_BOARD_ID := RE350-V1
>    IMAGE_SIZE := 6016k
>    SUPPORTED_DEVICES += re350-v1
> @@ -927,7 +927,7 @@ define Device/tplink_re500-v1
>    $(Device/tplink-safeloader)
>    DEVICE_MODEL := RE500
>    DEVICE_VARIANT := v1
> -  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-
> wolfssl
>    TPLINK_BOARD_ID := RE500-V1
>    IMAGE_SIZE := 14208k
>  endef
> @@ -937,7 +937,7 @@ define Device/tplink_re650-v1
>    $(Device/tplink-safeloader)
>    DEVICE_MODEL := RE650
>    DEVICE_VARIANT := v1
> -  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-
> wolfssl
>    TPLINK_BOARD_ID := RE650-V1
>    IMAGE_SIZE := 14208k
>  endef
> @@ -972,7 +972,7 @@ TARGET_DEVICES += ubnt_edgerouter-x-sfp
>  define Device/ubnt_unifi-nanohd
>    DEVICE_VENDOR := Ubiquiti
>    DEVICE_MODEL := UniFi nanoHD
> -  DEVICE_PACKAGES += kmod-mt7603 kmod-mt7615e kmod-mt7615-
> firmware wpad-basic
> +  DEVICE_PACKAGES += kmod-mt7603 kmod-mt7615e kmod-mt7615-
> firmware wpad-basic-wolfssl
>    IMAGE_SIZE := 15552k
>  endef
>  TARGET_DEVICES += ubnt_unifi-nanohd
> @@ -1003,7 +1003,7 @@ define Device/wevo_11acnas
>    DEVICE_VENDOR := WeVO
>    DEVICE_MODEL := 11AC NAS Router
>    DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
> -	kmod-usb-ledtrig-usbport wpad-basic
> +	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
>    SUPPORTED_DEVICES += 11acnas
>  endef
>  TARGET_DEVICES += wevo_11acnas
> @@ -1015,7 +1015,7 @@ define Device/wevo_w2914ns-v2
>    DEVICE_MODEL := W2914NS
>    DEVICE_VARIANT := v2
>    DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
> -	kmod-usb-ledtrig-usbport wpad-basic
> +	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
>    SUPPORTED_DEVICES += w2914nsv2
>  endef
>  TARGET_DEVICES += wevo_w2914ns-v2
> @@ -1032,7 +1032,7 @@ define Device/xiaomi-ac2100
>    IMAGE/rootfs0.bin := append-ubi | check-size
>    IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
>    DEVICE_VENDOR := Xiaomi
> -  DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7615-
> firmware wpad-basic uboot-envtools
> +  DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7615-
> firmware wpad-basic-wolfssl uboot-envtools
>  endef
> 
>  define Device/xiaomi_mi-router-ac2100
> @@ -1057,7 +1057,7 @@ define Device/xiaomi_mir3g
>    SUPPORTED_DEVICES += R3G
>    SUPPORTED_DEVICES += mir3g
>    DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
> -	kmod-usb-ledtrig-usbport wpad-basic uboot-envtools
> +	kmod-usb-ledtrig-usbport wpad-basic-wolfssl uboot-envtools
>  endef
>  TARGET_DEVICES += xiaomi_mir3g
> 
> @@ -1070,7 +1070,7 @@ define Device/xiaomi_mir3g-v2
>    DEVICE_ALT0_VENDOR := Xiaomi
>    DEVICE_ALT0_MODEL := Mi Router 4A
>    DEVICE_ALT0_VARIANT := Gigabit Edition
> -  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic
> +  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic-wolfssl
>  endef
>  TARGET_DEVICES += xiaomi_mir3g-v2
> 
> @@ -1088,7 +1088,7 @@ define Device/xiaomi_mir3p
>    IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-
> ubi | \
>  	check-size
>    DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3
> kmod-usb-ledtrig-usbport \
> -	wpad-basic uboot-envtools
> +	wpad-basic-wolfssl uboot-envtools
>  endef
>  TARGET_DEVICES += xiaomi_mir3p
> 
> @@ -1120,7 +1120,7 @@ define Device/youhua_wr1200js
>    DEVICE_VENDOR := YouHua
>    DEVICE_MODEL := WR1200JS
>    DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
> -	kmod-usb-ledtrig-usbport wpad-basic
> +	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
>  endef
>  TARGET_DEVICES += youhua_wr1200js
> 
> @@ -1129,7 +1129,7 @@ define Device/youku_yk-l2
>    DEVICE_VENDOR := Youku
>    DEVICE_MODEL := YK-L2
>    DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
> -	kmod-usb-ledtrig-usbport wpad-basic
> +	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
>  endef
>  TARGET_DEVICES += youku_yk-l2
> 
> @@ -1138,7 +1138,7 @@ define Device/zbtlink_zbt-we1326
>    DEVICE_VENDOR := Zbtlink
>    DEVICE_MODEL := ZBT-WE1326
>    DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-sdhci-
> mt7620 \
> -	wpad-basic
> +	wpad-basic-wolfssl
>    SUPPORTED_DEVICES += zbt-we1326
>  endef
>  TARGET_DEVICES += zbtlink_zbt-we1326
> @@ -1148,7 +1148,7 @@ define Device/zbtlink_zbt-we3526
>    DEVICE_VENDOR := Zbtlink
>    DEVICE_MODEL := ZBT-WE3526
>    DEVICE_PACKAGES := kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2
> kmod-usb3 \
> -	kmod-usb-ledtrig-usbport wpad-basic
> +	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
>  endef
>  TARGET_DEVICES += zbtlink_zbt-we3526
> 
> @@ -1157,7 +1157,7 @@ define Device/zbtlink_zbt-wg2626
>    DEVICE_VENDOR := Zbtlink
>    DEVICE_MODEL := ZBT-WG2626
>    DEVICE_PACKAGES := kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt76x2
> kmod-usb3 \
> -	kmod-usb-ledtrig-usbport wpad-basic
> +	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
>    SUPPORTED_DEVICES += zbt-wg2626
>  endef
>  TARGET_DEVICES += zbtlink_zbt-wg2626
> @@ -1168,7 +1168,7 @@ define Device/zbtlink_zbt-wg3526-16m
>    DEVICE_MODEL := ZBT-WG3526
>    DEVICE_VARIANT := 16M
>    DEVICE_PACKAGES := kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt7603
> kmod-mt76x2 \
> -	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
> +	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic-wolfssl
>    SUPPORTED_DEVICES += zbt-wg3526 zbt-wg3526-16M
>  endef
>  TARGET_DEVICES += zbtlink_zbt-wg3526-16m
> @@ -1179,7 +1179,7 @@ define Device/zbtlink_zbt-wg3526-32m
>    DEVICE_MODEL := ZBT-WG3526
>    DEVICE_VARIANT := 32M
>    DEVICE_PACKAGES := kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt7603
> kmod-mt76x2 \
> -	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
> +	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic-wolfssl
>    SUPPORTED_DEVICES += ac1200pro zbt-wg3526-32M
>  endef
>  TARGET_DEVICES += zbtlink_zbt-wg3526-32m
> @@ -1189,7 +1189,7 @@ define Device/zio_freezio
>    DEVICE_VENDOR := ZIO
>    DEVICE_MODEL := FREEZIO
>    DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
> -	kmod-usb-ledtrig-usbport wpad-basic
> +	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
>  endef
>  TARGET_DEVICES += zio_freezio
> 
> @@ -1201,7 +1201,7 @@ define Device/zyxel_wap6805
>    IMAGE_SIZE := 32448k
>    DEVICE_VENDOR := ZyXEL
>    DEVICE_MODEL := WAP6805
> -  DEVICE_PACKAGES := kmod-mt7603 wpad-basic kmod-mt7621-qtn-rgmii
> +  DEVICE_PACKAGES := kmod-mt7603 wpad-basic-wolfssl kmod-mt7621-
> qtn-rgmii
>    KERNEL := $(KERNEL_DTB) | uImage lzma | uimage-padhdr 160
>    IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
>  endef
> diff --git a/target/linux/ramips/mt7620/target.mk
> b/target/linux/ramips/mt7620/target.mk
> index ff890c554095..5cc325962501 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 ramdisk
>  CPU_TYPE:=24kc
> 
> -DEFAULT_PACKAGES += kmod-rt2800-soc wpad-basic swconfig
> +DEFAULT_PACKAGES += kmod-rt2800-soc wpad-basic-wolfssl swconfig
> 
>  KERNEL_PATCHVER:=5.4
> 
> diff --git a/target/linux/ramips/mt76x8/target.mk
> b/target/linux/ramips/mt76x8/target.mk
> index 4ecc19ff6202..3781dc72e709 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 ramdisk
>  CPU_TYPE:=24kc
> 
> -DEFAULT_PACKAGES += kmod-mt7603 wpad-basic swconfig
> +DEFAULT_PACKAGES += kmod-mt7603 wpad-basic-wolfssl swconfig
>  KERNEL_PATCHVER:=5.4
> 
>  define Target/Description
> diff --git a/target/linux/ramips/rt288x/target.mk
> b/target/linux/ramips/rt288x/target.mk
> index 57b0ee22514f..814ac97e8953 100644
> --- a/target/linux/ramips/rt288x/target.mk
> +++ b/target/linux/ramips/rt288x/target.mk
> @@ -7,7 +7,7 @@ BOARDNAME:=RT288x based boards
>  FEATURES+=small_flash
>  CPU_TYPE:=24kc
> 
> -DEFAULT_PACKAGES += kmod-rt2800-soc wpad-mini swconfig
> +DEFAULT_PACKAGES += kmod-rt2800-soc wpad-basic-wolfssl swconfig
> 
>  define Target/Description
>  	Build firmware images for Ralink RT288x based boards.
> diff --git a/target/linux/ramips/rt305x/target.mk
> b/target/linux/ramips/rt305x/target.mk
> index 51edace5921c..27ad670ca440 100644
> --- a/target/linux/ramips/rt305x/target.mk
> +++ b/target/linux/ramips/rt305x/target.mk
> @@ -7,7 +7,7 @@ BOARDNAME:=RT3x5x/RT5350 based boards
>  FEATURES+=usb ramdisk small_flash
>  CPU_TYPE:=24kc
> 
> -DEFAULT_PACKAGES += kmod-rt2800-soc wpad-mini swconfig
> +DEFAULT_PACKAGES += kmod-rt2800-soc wpad-basic-wolfssl swconfig
> 
>  define Target/Description
>  	Build firmware images for Ralink RT3x5x/RT5350 based boards.
> diff --git a/target/linux/ramips/rt3883/target.mk
> b/target/linux/ramips/rt3883/target.mk
> index 4a032f543747..ff878a0a597b 100644
> --- a/target/linux/ramips/rt3883/target.mk
> +++ b/target/linux/ramips/rt3883/target.mk
> @@ -7,7 +7,7 @@ BOARDNAME:=RT3662/RT3883 based boards
>  FEATURES+=usb pci small_flash
>  CPU_TYPE:=74kc
> 
> -DEFAULT_PACKAGES += kmod-rt2800-pci kmod-rt2800-soc wpad-mini
> swconfig
> +DEFAULT_PACKAGES += kmod-rt2800-pci kmod-rt2800-soc wpad-basic-
> wolfssl swconfig
> 
>  define Target/Description
>  	Build firmware images for Ralink RT3662/RT3883 based boards.
> diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile
> index ed901d2b479d..43ec4cc491fe 100644
> --- a/target/linux/rb532/Makefile
> +++ b/target/linux/rb532/Makefile
> @@ -15,6 +15,6 @@ KERNEL_PATCHVER:=4.14
> 
>  include $(INCLUDE_DIR)/target.mk
> 
> -DEFAULT_PACKAGES += wpad-basic kmod-ath5k kmod-input-rb532
> e2fsprogs mkf2fs nand-utils
> +DEFAULT_PACKAGES += wpad-basic-wolfssl kmod-ath5k kmod-input-rb532
> e2fsprogs mkf2fs nand-utils
> 
>  $(eval $(call BuildTarget))
> diff --git a/target/linux/sunxi/image/cortexa7.mk
> b/target/linux/sunxi/image/cortexa7.mk
> index 8fa648176fb8..27dd2d96ff0d 100644
> --- a/target/linux/sunxi/image/cortexa7.mk
> +++ b/target/linux/sunxi/image/cortexa7.mk
> @@ -26,7 +26,7 @@ define Device/friendlyarm_nanopi-m1-plus
>    DEVICE_VENDOR := FriendlyARM
>    DEVICE_MODEL := NanoPi M1 Plus
>    DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-
> heartbeat \
> -	kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic
> +	kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic-wolfssl
>    SOC := sun8i-h3
>  endef
>  TARGET_DEVICES += friendlyarm_nanopi-m1-plus
> @@ -42,7 +42,7 @@ define Device/friendlyarm_nanopi-neo-air
>    DEVICE_VENDOR := FriendlyARM
>    DEVICE_MODEL := NanoPi NEO Air
>    DEVICE_PACKAGES := kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-
> heartbeat \
> -	kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic
> +	kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic-wolfssl
>    SOC := sun8i-h3
>  endef
>  TARGET_DEVICES += friendlyarm_nanopi-neo-air
> @@ -50,7 +50,7 @@ TARGET_DEVICES += friendlyarm_nanopi-neo-air
>  define Device/lamobo_lamobo-r1
>    DEVICE_VENDOR := Lamobo
>    DEVICE_MODEL := Lamobo R1
> -  DEVICE_PACKAGES:=kmod-ata-sunxi kmod-rtl8192cu swconfig wpad-basic
> +  DEVICE_PACKAGES:=kmod-ata-sunxi kmod-rtl8192cu swconfig wpad-
> basic-wolfssl
>    SOC := sun7i-a20
>  endef
>  TARGET_DEVICES += lamobo_lamobo-r1
> @@ -133,7 +133,7 @@ define Device/sinovoip_bananapi-m2-plus
>    DEVICE_VENDOR := Sinovoip
>    DEVICE_MODEL := Banana Pi M2+
>    DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-
> heartbeat \
> -	kmod-brcmfmac brcmfmac-firmware-43430a0-sdio wpad-basic
> +	kmod-brcmfmac brcmfmac-firmware-43430a0-sdio wpad-basic-
> wolfssl
>    SOC := sun8i-h3
>  endef
>  TARGET_DEVICES += sinovoip_bananapi-m2-plus
> diff --git a/target/linux/sunxi/profiles/00-default.mk
> b/target/linux/sunxi/profiles/00-default.mk
> index cecdd0b83793..7dc791ecde35 100644
> --- a/target/linux/sunxi/profiles/00-default.mk
> +++ b/target/linux/sunxi/profiles/00-default.mk
> @@ -16,7 +16,7 @@ define Profile/Default
>  	kmod-sun4i-emac \
>  	rtl8188eu-firmware \
>  	swconfig \
> -	wpad-basic
> +	wpad-basic-wolfssl
>    PRIORITY := 1
>  endef
> 
> diff --git a/target/linux/tegra/image/Makefile
> b/target/linux/tegra/image/Makefile
> index 3a19feb55e92..33e7b508d966 100644
> --- a/target/linux/tegra/image/Makefile
> +++ b/target/linux/tegra/image/Makefile
> @@ -50,7 +50,7 @@ define Device/compulab_trimslice
>    DEVICE_MODEL := TrimSlice
>    DEVICE_DTS := tegra20-trimslice
>    DEVICE_PACKAGES := kmod-r8169 kmod-rt2800-usb kmod-rtc-em3027 \
> -	kmod-usb-storage wpad-mini
> +	kmod-usb-storage wpad-basic-wolfssl
>    UBOOT := trimslice-mmc
>  endef
>  TARGET_DEVICES += compulab_trimslice
> diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile
> index f8b8c8f7e16c..0bfdfe3e1f48 100644
> --- a/target/linux/uml/Makefile
> +++ b/target/linux/uml/Makefile
> @@ -33,7 +33,7 @@ endef
> 
>  LINUX_TARGET_CONFIG:=$(CURDIR)/config/$(ARCH)
> 
> -DEFAULT_PACKAGES += wpad-basic kmod-mac80211-hwsim mkf2fs
> e2fsprogs
> +DEFAULT_PACKAGES += wpad-basic-wolfssl kmod-mac80211-hwsim mkf2fs
> e2fsprogs
> 
>  endif
> 
> 
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Petr Štetiar July 27, 2020, 10:42 a.m. UTC | #2
mail@adrianschmutzler.de <mail@adrianschmutzler.de> [2020-07-27 12:04:09]:

Hi,

> as stated earlier, I'm fine with covering ath79/tiny etc. as well, but I'd
> personally not touch ar71xx.

sorry about that, I failed to exclude ar71xx from that git/sed foo, should be
fixed in v3. Thanks for the review!

-- ynezz
diff mbox series

Patch

diff --git a/target/linux/apm821xx/image/sata.mk b/target/linux/apm821xx/image/sata.mk
index 6fe8324b93ac..bcb612c22f1d 100644
--- a/target/linux/apm821xx/image/sata.mk
+++ b/target/linux/apm821xx/image/sata.mk
@@ -6,7 +6,7 @@  endef
 define Device/wd_mybooklive
   DEVICE_VENDOR := Western Digital
   DEVICE_MODEL := My Book Live Series (Single + Duo)
-  DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-basic
+  DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-basic-wolfssl
   SUPPORTED_DEVICES += mbl wd,mybooklive-duo
   BLOCKSIZE := 1k
   DTB_SIZE := 16384
diff --git a/target/linux/apm821xx/nand/target.mk b/target/linux/apm821xx/nand/target.mk
index 16475307d732..d40b0fbc19b5 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-basic
+DEFAULT_PACKAGES += kmod-ath9k swconfig wpad-basic-wolfssl
 
 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 db48353bf299..887741abd384 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-basic
+  PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-basic-wolfssl
 endef
 
 define Profile/Default/Description
diff --git a/target/linux/ar71xx/generic/target.mk b/target/linux/ar71xx/generic/target.mk
index 0a26110d27a8..d8e3ff217d81 100644
--- a/target/linux/ar71xx/generic/target.mk
+++ b/target/linux/ar71xx/generic/target.mk
@@ -1,7 +1,7 @@ 
 BOARDNAME:=Generic
 FEATURES += squashfs
 
-DEFAULT_PACKAGES += wpad-basic
+DEFAULT_PACKAGES += wpad-basic-wolfssl
 
 define Target/Description
 	Build firmware images for generic Atheros AR71xx/AR913x/AR934x based boards.
diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk
index 5098650ec7a6..dc1f0ba6a8be 100644
--- a/target/linux/ar71xx/image/generic.mk
+++ b/target/linux/ar71xx/image/generic.mk
@@ -547,7 +547,7 @@  define Device/lan-turtle
   $(Device/tplink-16mlzma)
   DEVICE_TITLE := Hak5 LAN Turtle
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-storage \
-	-kmod-ath9k -swconfig -uboot-envtools -wpad-basic
+	-kmod-ath9k -swconfig -uboot-envtools -wpad-basic-wolfssl
   BOARDNAME := LAN-TURTLE
   DEVICE_PROFILE := LANTURTLE
   TPLINK_HWID := 0x5348334c
@@ -704,7 +704,7 @@  define Device/packet-squirrel
   $(Device/tplink-16mlzma)
   DEVICE_TITLE := Hak5 Packet Squirrel
   DEVICE_PACKAGES := kmod-usb2 \
-	-kmod-ath9k -swconfig -uboot-envtools -wpad-basic
+	-kmod-ath9k -swconfig -uboot-envtools -wpad-basic-wolfssl
   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 5ae57fadb38f..be5842c4e521 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 wpad-basic
+DEFAULT_PACKAGES += nand-utils wpad-basic-wolfssl
 
 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 d5191b22608e..10e66fff015f 100644
--- a/target/linux/ar71xx/nand/target.mk
+++ b/target/linux/ar71xx/nand/target.mk
@@ -1,7 +1,7 @@ 
 BOARDNAME := Generic devices with NAND flash
 FEATURES += squashfs nand rtc
 
-DEFAULT_PACKAGES += wpad-basic
+DEFAULT_PACKAGES += wpad-basic-wolfssl
 
 define Target/Description
 	Build firmware images for Atheros AR71xx/AR913x based boards with
diff --git a/target/linux/ar71xx/tiny/target.mk b/target/linux/ar71xx/tiny/target.mk
index 89d4447e1e4a..506e86e6b65f 100644
--- a/target/linux/ar71xx/tiny/target.mk
+++ b/target/linux/ar71xx/tiny/target.mk
@@ -1,7 +1,7 @@ 
 BOARDNAME:=Devices with small flash
 FEATURES += squashfs small_flash
 
-DEFAULT_PACKAGES += wpad-mini
+DEFAULT_PACKAGES += wpad-basic-wolfssl
 
 define Target/Description
 	Build firmware images for Atheros AR71xx/AR913x/AR934x based boards with small NOR flash.
diff --git a/target/linux/arc770/generic/profiles/00-default.mk b/target/linux/arc770/generic/profiles/00-default.mk
index 2ca93ddb040c..9f6966317048 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-ohci kmod-usb2 kmod-ath9k-htc wpad-basic
+	PACKAGES:= kmod-usb-ohci kmod-usb2 kmod-ath9k-htc wpad-basic-wolfssl
 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 ec9bbbb19ff4..172ad4bcfbe3 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-usb2 kmod-ath9k-htc wpad-basic
+	PACKAGES:= kmod-usb2 kmod-ath9k-htc wpad-basic-wolfssl
 endef
 
 define Profile/Default/Description
diff --git a/target/linux/ath25/Makefile b/target/linux/ath25/Makefile
index 4fb082edfd67..f8851124608e 100644
--- a/target/linux/ath25/Makefile
+++ b/target/linux/ath25/Makefile
@@ -19,6 +19,6 @@  endef
 
 include $(INCLUDE_DIR)/target.mk
 
-DEFAULT_PACKAGES += wpad-mini kmod-ath5k swconfig kmod-gpio-button-hotplug
+DEFAULT_PACKAGES += wpad-basic-wolfssl kmod-ath5k swconfig kmod-gpio-button-hotplug
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/ath79/generic/target.mk b/target/linux/ath79/generic/target.mk
index 88346efd2b09..0624f795726a 100644
--- a/target/linux/ath79/generic/target.mk
+++ b/target/linux/ath79/generic/target.mk
@@ -1,7 +1,7 @@ 
 BOARDNAME:=Generic
 FEATURES += squashfs
 
-DEFAULT_PACKAGES += wpad-basic
+DEFAULT_PACKAGES += wpad-basic-wolfssl
 
 define Target/Description
 	Build firmware images for generic Atheros AR71xx/AR913x/AR934x based boards.
diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk
index 55d98ce5085a..b94518377690 100644
--- a/target/linux/ath79/image/generic-ubnt.mk
+++ b/target/linux/ath79/image/generic-ubnt.mk
@@ -287,7 +287,7 @@  endef
 TARGET_DEVICES += ubnt_rocket-m
 
 define Device/ubnt_routerstation_common
-  DEVICE_PACKAGES := -kmod-ath9k -wpad-mini -uboot-envtools kmod-usb-ohci \
+  DEVICE_PACKAGES := -kmod-ath9k -wpad-basic-wolfssl -uboot-envtools kmod-usb-ohci \
 	kmod-usb2 fconfig
   DEVICE_VENDOR := Ubiquiti
   SOC := ar7161
diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
index 8dc16983e1cb..d161e408fae8 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -918,7 +918,7 @@  define Device/iodata_etg3-r
   DEVICE_VENDOR := I-O DATA
   DEVICE_MODEL := ETG3-R
   IMAGE_SIZE := 7680k
-  DEVICE_PACKAGES := -iwinfo -kmod-ath9k -wpad-basic
+  DEVICE_PACKAGES := -iwinfo -kmod-ath9k -wpad-basic-wolfssl
 endef
 TARGET_DEVICES += iodata_etg3-r
 
@@ -978,7 +978,7 @@  define Device/jjplus_ja76pf2
   SOC := ar7161
   DEVICE_VENDOR := jjPlus
   DEVICE_MODEL := JA76PF2
-  DEVICE_PACKAGES += -kmod-ath9k -swconfig -wpad-mini -uboot-envtools fconfig
+  DEVICE_PACKAGES += -kmod-ath9k -swconfig -wpad-basic-wolfssl -uboot-envtools fconfig
   IMAGES := kernel.bin rootfs.bin
   IMAGE/kernel.bin := append-kernel
   IMAGE/rootfs.bin := append-rootfs | pad-rootfs
diff --git a/target/linux/ath79/mikrotik/target.mk b/target/linux/ath79/mikrotik/target.mk
index face016a51f2..0394f4427ddd 100644
--- a/target/linux/ath79/mikrotik/target.mk
+++ b/target/linux/ath79/mikrotik/target.mk
@@ -1,7 +1,7 @@ 
 BOARDNAME := MikroTik devices
 FEATURES += minor nand squashfs
 
-DEFAULT_PACKAGES += wpad-basic
+DEFAULT_PACKAGES += wpad-basic-wolfssl
 
 define Target/Description
 	Build firmware images for MikroTik devices based on Qualcomm Atheros
diff --git a/target/linux/ath79/nand/target.mk b/target/linux/ath79/nand/target.mk
index c565c9b2b8c4..a4069d7610be 100644
--- a/target/linux/ath79/nand/target.mk
+++ b/target/linux/ath79/nand/target.mk
@@ -2,7 +2,7 @@  BOARDNAME := Generic devices with NAND flash
 
 FEATURES += squashfs nand
 
-DEFAULT_PACKAGES += wpad-basic
+DEFAULT_PACKAGES += wpad-basic-wolfssl
 
 define Target/Description
 	Firmware for boards using Qualcomm Atheros, MIPS-based SoCs
diff --git a/target/linux/ath79/tiny/target.mk b/target/linux/ath79/tiny/target.mk
index dba57e5965f3..2ee71ea92137 100644
--- a/target/linux/ath79/tiny/target.mk
+++ b/target/linux/ath79/tiny/target.mk
@@ -1,7 +1,7 @@ 
 BOARDNAME:=Devices with small flash
 FEATURES += squashfs small_flash
 
-DEFAULT_PACKAGES += wpad-mini
+DEFAULT_PACKAGES += wpad-basic-wolfssl
 
 define Target/Description
 	Build firmware images for Atheros AR71xx/AR913x/AR934x based boards with small flash
diff --git a/target/linux/bcm27xx/image/Makefile b/target/linux/bcm27xx/image/Makefile
index 2b97593c9a25..f009b997e973 100644
--- a/target/linux/bcm27xx/image/Makefile
+++ b/target/linux/bcm27xx/image/Makefile
@@ -79,7 +79,7 @@  define Device/rpi
   DEVICE_PACKAGES := \
 	cypress-firmware-43430-sdio \
 	cypress-nvram-43430-sdio-rpi-zero-w \
-	kmod-brcmfmac wpad-basic
+	kmod-brcmfmac wpad-basic-wolfssl
 endef
 ifeq ($(SUBTARGET),bcm2708)
   TARGET_DEVICES += rpi
@@ -103,7 +103,7 @@  define Device/rpi-2
 	cypress-nvram-43430-sdio-rpi-3b \
 	cypress-firmware-43455-sdio \
 	cypress-nvram-43455-sdio-rpi-3b-plus cypress-nvram-43455-sdio-rpi-4b \
-	kmod-brcmfmac wpad-basic
+	kmod-brcmfmac wpad-basic-wolfssl
   IMAGE/sysupgrade.img.gz := boot-common | boot-2708 | boot-2711 | sdcard-img | gzip | append-metadata
   IMAGE/factory.img.gz := boot-common | boot-2708 | boot-2711 | sdcard-img | gzip
 endef
@@ -128,7 +128,7 @@  define Device/rpi-3
 	cypress-nvram-43430-sdio-rpi-3b \
 	cypress-firmware-43455-sdio \
 	cypress-nvram-43455-sdio-rpi-3b-plus \
-	kmod-brcmfmac wpad-basic
+	kmod-brcmfmac wpad-basic-wolfssl
 endef
 ifeq ($(SUBTARGET),bcm2710)
   TARGET_DEVICES += rpi-3
@@ -143,7 +143,7 @@  define Device/rpi-4
   DEVICE_PACKAGES := \
 	cypress-firmware-43455-sdio \
 	cypress-nvram-43455-sdio-rpi-4b \
-	kmod-brcmfmac wpad-basic
+	kmod-brcmfmac wpad-basic-wolfssl
   IMAGE/sysupgrade.img.gz := boot-common | boot-2711 | sdcard-img | gzip | append-metadata
   IMAGE/factory.img.gz := boot-common | boot-2711 | sdcard-img | gzip
 endef
diff --git a/target/linux/bcm47xx/generic/profiles/101-Broadcom-wl.mk b/target/linux/bcm47xx/generic/profiles/101-Broadcom-wl.mk
index c3e9d20c1374..db0a31d6caf2 100644
--- a/target/linux/bcm47xx/generic/profiles/101-Broadcom-wl.mk
+++ b/target/linux/bcm47xx/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-basic kmod-b44 kmod-tg3 kmod-bgmac kmod-brcm-wl wlc nas
+  PACKAGES:=-wpad-basic-wolfssl kmod-b44 kmod-tg3 kmod-bgmac kmod-brcm-wl wlc nas
 endef
 
 define Profile/Broadcom-wl/Description
diff --git a/target/linux/bcm47xx/generic/profiles/105-Broadcom-none.mk b/target/linux/bcm47xx/generic/profiles/105-Broadcom-none.mk
index 4497124a2e99..9c66d5796781 100644
--- a/target/linux/bcm47xx/generic/profiles/105-Broadcom-none.mk
+++ b/target/linux/bcm47xx/generic/profiles/105-Broadcom-none.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/Broadcom-none
   NAME:=Broadcom SoC, all Ethernet, No WiFi
-  PACKAGES:=-wpad-basic kmod-b44 kmod-tg3 kmod-bgmac
+  PACKAGES:=-wpad-basic-wolfssl kmod-b44 kmod-tg3 kmod-bgmac
 endef
 
 define Profile/Broadcom-none/Description
diff --git a/target/linux/bcm47xx/generic/profiles/201-Broadcom-b44-wl.mk b/target/linux/bcm47xx/generic/profiles/201-Broadcom-b44-wl.mk
index 79b7c5c0002e..fe6c2d8f87ae 100644
--- a/target/linux/bcm47xx/generic/profiles/201-Broadcom-b44-wl.mk
+++ b/target/linux/bcm47xx/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-basic kmod-b44 kmod-brcm-wl wlc nas
+  PACKAGES:=-wpad-basic-wolfssl kmod-b44 kmod-brcm-wl wlc nas
 endef
 
 define Profile/Broadcom-b44-wl/Description
diff --git a/target/linux/bcm47xx/generic/profiles/205-Broadcom-b44-none.mk b/target/linux/bcm47xx/generic/profiles/205-Broadcom-b44-none.mk
index 0854b5041ee8..6c409057cc7a 100644
--- a/target/linux/bcm47xx/generic/profiles/205-Broadcom-b44-none.mk
+++ b/target/linux/bcm47xx/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-basic kmod-b44
+  PACKAGES:=-wpad-basic-wolfssl kmod-b44
 endef
 
 define Profile/Broadcom-b44-none/Description
diff --git a/target/linux/bcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk b/target/linux/bcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk
index 6946668c915d..20acd75bc505 100644
--- a/target/linux/bcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk
+++ b/target/linux/bcm47xx/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-basic kmod-brcm-wl wlc nas kmod-tg3
+  PACKAGES:=-wpad-basic-wolfssl kmod-brcm-wl wlc nas kmod-tg3
 endef
 
 define Profile/Broadcom-tg3-wl/Description
diff --git a/target/linux/bcm47xx/generic/profiles/215-Broadcom-tg3-none.mk b/target/linux/bcm47xx/generic/profiles/215-Broadcom-tg3-none.mk
index a5a3b4a0104a..7974279bc4f8 100644
--- a/target/linux/bcm47xx/generic/profiles/215-Broadcom-tg3-none.mk
+++ b/target/linux/bcm47xx/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-basic kmod-tg3
+  PACKAGES:=-wpad-basic-wolfssl kmod-tg3
 endef
 
 define Profile/Broadcom-tg3-none/Description
diff --git a/target/linux/bcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk b/target/linux/bcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk
index acdc20fb7021..bb7e7c2c9ca1 100644
--- a/target/linux/bcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk
+++ b/target/linux/bcm47xx/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-basic kmod-bgmac kmod-brcm-wl wlc nas
+  PACKAGES:=-wpad-basic-wolfssl kmod-bgmac kmod-brcm-wl wlc nas
 endef
 
 define Profile/Broadcom-bgmac-wl/Description
diff --git a/target/linux/bcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk b/target/linux/bcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk
index db2d1a264c61..77299cd501a7 100644
--- a/target/linux/bcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk
+++ b/target/linux/bcm47xx/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-basic kmod-bgmac
+  PACKAGES:=-wpad-basic-wolfssl kmod-bgmac
 endef
 
 define Profile/Broadcom-bgmac-none/Description
diff --git a/target/linux/bcm47xx/generic/profiles/PS-1208MFG.mk b/target/linux/bcm47xx/generic/profiles/PS-1208MFG.mk
index 14ee46f20042..90c2688c8ec7 100644
--- a/target/linux/bcm47xx/generic/profiles/PS-1208MFG.mk
+++ b/target/linux/bcm47xx/generic/profiles/PS-1208MFG.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/Ps1208mfg
   NAME:=Edimax PS-1208MFG
-  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
+  PACKAGES:=-firewall -dropbear -dnsmasq -mtd -ppp -wpad-basic-wolfssl 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/bcm47xx/generic/target.mk b/target/linux/bcm47xx/generic/target.mk
index 2f93778b09cf..70397de39896 100644
--- a/target/linux/bcm47xx/generic/target.mk
+++ b/target/linux/bcm47xx/generic/target.mk
@@ -1,7 +1,7 @@ 
 BOARDNAME:=Generic
 FEATURES+=pcmcia
 
-DEFAULT_PACKAGES += wpad-basic
+DEFAULT_PACKAGES += wpad-basic-wolfssl
 
 define Target/Description
 	Build generic firmware for all Broadcom BCM47xx and BCM53xx MIPS
diff --git a/target/linux/bcm47xx/legacy/profiles/101-Broadcom-wl.mk b/target/linux/bcm47xx/legacy/profiles/101-Broadcom-wl.mk
index 6a4c5b039481..26bbacf3bed3 100644
--- a/target/linux/bcm47xx/legacy/profiles/101-Broadcom-wl.mk
+++ b/target/linux/bcm47xx/legacy/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-brcm-wl-mini wlc nas
+  PACKAGES:=-wpad-basic-wolfssl kmod-brcm-wl-mini wlc nas
 endef
 
 define Profile/Broadcom-wl/Description
diff --git a/target/linux/bcm47xx/legacy/target.mk b/target/linux/bcm47xx/legacy/target.mk
index fca612855877..e3586a8add72 100644
--- a/target/linux/bcm47xx/legacy/target.mk
+++ b/target/linux/bcm47xx/legacy/target.mk
@@ -1,7 +1,7 @@ 
 FEATURES += low_mem pcmcia small_flash
 BOARDNAME:=Legacy (BMIPS3300)
 
-DEFAULT_PACKAGES += wpad-mini
+DEFAULT_PACKAGES += wpad-basic-wolfssl
 
 define Target/Description
 	Build firmware for Broadcom BCM47xx and BCM53xx devices with
diff --git a/target/linux/bcm47xx/mips74k/profiles/102-Broadcom-wl.mk b/target/linux/bcm47xx/mips74k/profiles/102-Broadcom-wl.mk
index 66b13bf879aa..8f60c7ee32e7 100644
--- a/target/linux/bcm47xx/mips74k/profiles/102-Broadcom-wl.mk
+++ b/target/linux/bcm47xx/mips74k/profiles/102-Broadcom-wl.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/Broadcom-mips74k-wl
   NAME:=Broadcom SoC, BCM43xx WiFi (proprietary wl)
-  PACKAGES:=-wpad-basic kmod-brcm-wl wlc nas
+  PACKAGES:=-wpad-basic-wolfssl kmod-brcm-wl wlc nas
 endef
 
 define Profile/Broadcom-mips74k-wl/Description
diff --git a/target/linux/bcm47xx/mips74k/profiles/103-Broadcom-none.mk b/target/linux/bcm47xx/mips74k/profiles/103-Broadcom-none.mk
index cc4668de5244..66e9a9f0f7fa 100644
--- a/target/linux/bcm47xx/mips74k/profiles/103-Broadcom-none.mk
+++ b/target/linux/bcm47xx/mips74k/profiles/103-Broadcom-none.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/Broadcom-mips74k-none
   NAME:=Broadcom SoC, No WiFi
-  PACKAGES:=-wpad-basic
+  PACKAGES:=-wpad-basic-wolfssl
 endef
 
 define Profile/Broadcom-mips74k-none/Description
diff --git a/target/linux/bcm47xx/mips74k/target.mk b/target/linux/bcm47xx/mips74k/target.mk
index 1e2e8436d5ee..ee20982e542a 100644
--- a/target/linux/bcm47xx/mips74k/target.mk
+++ b/target/linux/bcm47xx/mips74k/target.mk
@@ -1,7 +1,7 @@ 
 BOARDNAME:=MIPS 74K
 CPU_TYPE:=74kc
 
-DEFAULT_PACKAGES += wpad-basic
+DEFAULT_PACKAGES += wpad-basic-wolfssl
 
 define Target/Description
 	Build firmware for Broadcom BCM47xx and BCM53xx devices with
diff --git a/target/linux/bcm53xx/image/Makefile b/target/linux/bcm53xx/image/Makefile
index b3ec1e99a28f..0e3779080233 100644
--- a/target/linux/bcm53xx/image/Makefile
+++ b/target/linux/bcm53xx/image/Makefile
@@ -113,7 +113,7 @@  DEVICE_VARS += SIGNATURE
 DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_REGION TPLINK_BOARD
 DEVICE_VARS += LUXUL_BOARD
 
-IEEE8021X := wpad-basic
+IEEE8021X := wpad-basic-wolfssl
 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/bcm63xx/image/Makefile b/target/linux/bcm63xx/image/Makefile
index 90d87f7bd46f..d8e68862b320 100644
--- a/target/linux/bcm63xx/image/Makefile
+++ b/target/linux/bcm63xx/image/Makefile
@@ -311,12 +311,12 @@  define Device/Default
 endef
 DEVICE_VARS += CHIP_ID DEVICE_LOADADDR
 
-ATH5K_PACKAGES := kmod-ath5k wpad-basic
-ATH9K_PACKAGES := kmod-ath9k wpad-basic
-B43_PACKAGES := kmod-b43 wpad-basic
+ATH5K_PACKAGES := kmod-ath5k wpad-basic-wolfssl
+ATH9K_PACKAGES := kmod-ath9k wpad-basic-wolfssl
+B43_PACKAGES := kmod-b43 wpad-basic-wolfssl
 BRCMWL_PACKAGES := kmod-brcm-wl nas wlc
-RT28_PACKAGES := kmod-rt2800-pci wpad-basic
-RT61_PACKAGES := kmod-rt61-pci wpad-basic
+RT28_PACKAGES := kmod-rt2800-pci wpad-basic-wolfssl
+RT61_PACKAGES := kmod-rt61-pci wpad-basic-wolfssl
 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/bcm63xx/profiles/default.mk b/target/linux/bcm63xx/profiles/default.mk
index 95cd67c46ea1..2df9d062ff68 100644
--- a/target/linux/bcm63xx/profiles/default.mk
+++ b/target/linux/bcm63xx/profiles/default.mk
@@ -7,7 +7,7 @@ 
 
 define Profile/Default
   NAME:=Default Profile
-  PACKAGES:=kmod-b43 wpad-basic
+  PACKAGES:=kmod-b43 wpad-basic-wolfssl
   PRIORITY:=1
 endef
 
diff --git a/target/linux/cns3xxx/Makefile b/target/linux/cns3xxx/Makefile
index 4df77967bf6c..04df322b64c9 100644
--- a/target/linux/cns3xxx/Makefile
+++ b/target/linux/cns3xxx/Makefile
@@ -23,6 +23,6 @@  include $(INCLUDE_DIR)/target.mk
 
 KERNELNAME:=zImage
 
-DEFAULT_PACKAGES += kmod-ath9k kmod-usb2 wpad-basic
+DEFAULT_PACKAGES += kmod-ath9k kmod-usb2 wpad-basic-wolfssl
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/ipq40xx/Makefile b/target/linux/ipq40xx/Makefile
index 94b47c4c96de..4d9b2debcaed 100644
--- a/target/linux/ipq40xx/Makefile
+++ b/target/linux/ipq40xx/Makefile
@@ -17,7 +17,7 @@  include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += \
 	kmod-usb-dwc3-qcom \
 	kmod-leds-gpio kmod-gpio-button-hotplug swconfig \
-	kmod-ath10k-ct wpad-basic \
+	kmod-ath10k-ct wpad-basic-wolfssl \
 	kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019-ct
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile
index 98ea35e0a6fa..bd85730d7f6a 100644
--- a/target/linux/ipq806x/Makefile
+++ b/target/linux/ipq806x/Makefile
@@ -20,7 +20,7 @@  DEFAULT_PACKAGES += \
 	kmod-ata-ahci kmod-ata-ahci-platform \
 	kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \
 	kmod-usb-phy-qcom-dwc3 kmod-usb3 kmod-usb-dwc3-qcom \
-	kmod-ath10k-ct wpad-basic \
+	kmod-ath10k-ct wpad-basic-wolfssl \
 	uboot-envtools
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile
index ba93fffeb216..4b5ceef94182 100644
--- a/target/linux/kirkwood/image/Makefile
+++ b/target/linux/kirkwood/image/Makefile
@@ -33,7 +33,7 @@  define Device/checkpoint_l-50
   DEVICE_MODEL := L-50
   DEVICE_DTS := kirkwood-l-50
   DEVICE_PACKAGES := kmod-ath9k kmod-gpio-button-hotplug kmod-mvsdio \
-	kmod-rtc-s35390a kmod-usb-ledtrig-usbport wpad-basic
+	kmod-rtc-s35390a kmod-usb-ledtrig-usbport wpad-basic-wolfssl
   IMAGES := sysupgrade.bin
 endef
 TARGET_DEVICES += checkpoint_l-50
@@ -94,7 +94,7 @@  TARGET_DEVICES += iom_ix2-200
 define Device/linksys_audi
   DEVICE_VENDOR := Linksys
   DEVICE_MODEL := EA3500 (Audi)
-  DEVICE_PACKAGES := kmod-mwl8k wpad-basic kmod-gpio-button-hotplug
+  DEVICE_PACKAGES := kmod-mwl8k wpad-basic-wolfssl kmod-gpio-button-hotplug
   PAGESIZE := 512
   SUBPAGESIZE := 256
   BLOCKSIZE := 16k
@@ -109,7 +109,7 @@  TARGET_DEVICES += linksys_audi
 define Device/linksys_viper
   DEVICE_VENDOR := Linksys
   DEVICE_MODEL := E4200v2 / EA4500 (Viper)
-  DEVICE_PACKAGES := kmod-mwl8k wpad-basic kmod-gpio-button-hotplug
+  DEVICE_PACKAGES := kmod-mwl8k wpad-basic-wolfssl kmod-gpio-button-hotplug
   KERNEL_SIZE := 2688k
   KERNEL_IN_UBI :=
   UBINIZE_OPTS := -E 5
diff --git a/target/linux/kirkwood/profiles/00-default.mk b/target/linux/kirkwood/profiles/00-default.mk
index bfc2154c4877..4bad7d668124 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 wpad-basic
+	PACKAGES:=kmod-mwl8k wpad-basic-wolfssl
 	PRIORITY:=1
 endef
 
diff --git a/target/linux/lantiq/image/ar9.mk b/target/linux/lantiq/image/ar9.mk
index 7a8f05ea58f9..ad061b27762b 100644
--- a/target/linux/lantiq/image/ar9.mk
+++ b/target/linux/lantiq/image/ar9.mk
@@ -3,7 +3,7 @@  define Device/avm_fritz7312
   DEVICE_MODEL := FRITZ!Box 7312
   SOC := ar9
   IMAGE_SIZE := 15744k
-  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \
+  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-wolfssl \
 	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 \
@@ -18,7 +18,7 @@  define Device/avm_fritz7320
   DEVICE_ALT0_MODEL := HomeServer
   SOC := ar9
   IMAGE_SIZE := 15744k
-  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \
+  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-wolfssl \
 	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 \
@@ -39,7 +39,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-basic \
+	kmod-ath9k kmod-owl-loader wpad-basic-wolfssl \
 	uboot-envtools
   SUPPORTED_DEVICES += BTHOMEHUBV3A
 endef
@@ -56,7 +56,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-basic
+	kmod-ath9k kmod-owl-loader wpad-basic-wolfssl
   SUPPORTED_DEVICES := WBMR buffalo,wbmr-hp-g300h
 endef
 TARGET_DEVICES += buffalo_wbmr-hp-g300h-a
@@ -72,7 +72,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-basic
+	kmod-ath9k kmod-owl-loader wpad-basic-wolfssl
   SUPPORTED_DEVICES := WBMR buffalo,wbmr-hp-g300h
 endef
 TARGET_DEVICES += buffalo_wbmr-hp-g300h-b
@@ -102,7 +102,7 @@  define Device/netgear_dgn3500
 	dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "WW" | pad-rootfs | \
 	check-size 16320k | pad-to 16384k
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
-	kmod-ath9k kmod-owl-loader wpad-basic \
+	kmod-ath9k kmod-owl-loader wpad-basic-wolfssl \
 	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 \
@@ -125,7 +125,7 @@  define Device/netgear_dgn3500b
 	dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "DE" | pad-rootfs | \
 	check-size 16320k | pad-to 16384k
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
-	kmod-ath9k kmod-owl-loader wpad-basic \
+	kmod-ath9k kmod-owl-loader wpad-basic-wolfssl \
 	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 \
@@ -139,7 +139,7 @@  define Device/zte_h201l
   DEVICE_MODEL := H201L
   IMAGE_SIZE := 7808k
   SOC := ar9
-  DEVICE_PACKAGES := kmod-ath9k-htc wpad-basic \
+  DEVICE_PACKAGES := kmod-ath9k-htc wpad-basic-wolfssl \
 	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 \
@@ -155,7 +155,7 @@  define Device/zyxel_p-2601hn
   DEVICE_VARIANT := F1/F3
   IMAGE_SIZE := 15616k
   SOC := ar9
-  DEVICE_PACKAGES := kmod-rt2800-usb wpad-basic \
+  DEVICE_PACKAGES := kmod-rt2800-usb wpad-basic-wolfssl \
 	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 \
diff --git a/target/linux/lantiq/image/danube.mk b/target/linux/lantiq/image/danube.mk
index 2fb5ea061f90..6f9ffbb98aa6 100644
--- a/target/linux/lantiq/image/danube.mk
+++ b/target/linux/lantiq/image/danube.mk
@@ -10,7 +10,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-basic
+	kmod-rt2800-pci kmod-ath5k wpad-basic-wolfssl
   SUPPORTED_DEVICES += ARV4510PW
 endef
 TARGET_DEVICES += arcadyan_arv4510pw
@@ -42,7 +42,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-basic
+	kmod-rt2800-pci wpad-basic-wolfssl
   SUPPORTED_DEVICES += ARV7506PW11
 endef
 TARGET_DEVICES += arcadyan_arv7506pw11
@@ -59,7 +59,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-basic \
+	kmod-rt2800-pci wpad-basic-wolfssl \
 	kmod-usb-uhci kmod-usb2 kmod-usb2-pci
   SUPPORTED_DEVICES += ARV7510PW22
 endef
@@ -76,7 +76,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-basic
+	kmod-ath9k kmod-owl-loader wpad-basic-wolfssl
   SUPPORTED_DEVICES += ARV7518PW
 endef
 TARGET_DEVICES += arcadyan_arv7518pw
@@ -92,7 +92,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-basic
+	kmod-rt2800-pci wpad-basic-wolfssl
   SUPPORTED_DEVICES += ARV7519PW
 endef
 TARGET_DEVICES += arcadyan_arv7519pw
@@ -105,7 +105,7 @@  define Device/arcadyan_arv7525pw
   DEVICE_ALT0_VARIANT := Typ A
   IMAGE_SIZE := 3776k
   SOC := danube
-  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic \
+  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-wolfssl \
 	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
@@ -125,7 +125,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-basic
+	kmod-rt2800-pci wpad-basic-wolfssl
   SUPPORTED_DEVICES += ARV752DPW
 endef
 TARGET_DEVICES += arcadyan_arv752dpw
@@ -142,7 +142,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-basic
+	kmod-rt2800-pci wpad-basic-wolfssl
   SUPPORTED_DEVICES += ARV752DPW22
 endef
 TARGET_DEVICES += arcadyan_arv752dpw22
@@ -158,7 +158,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-basic
+	kmod-ath9k kmod-owl-loader wpad-basic-wolfssl
   SUPPORTED_DEVICES += ARV8539PW22
 endef
 TARGET_DEVICES += arcadyan_arv8539pw22
@@ -174,7 +174,7 @@  define Device/audiocodes_mp-252
 	kmod-usb-ledtrig-usbport kmod-usb-dwc2 \
 	kmod-rt2800-pci \
 	ltq-adsl-app ppp-mod-pppoa \
-	wpad-basic
+	wpad-basic-wolfssl
   SUPPORTED_DEVICES += ACMP252
 endef
 TARGET_DEVICES += audiocodes_mp-252
@@ -191,7 +191,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-basic
+	kmod-ath9k kmod-owl-loader wpad-basic-wolfssl
   SUPPORTED_DEVICES += BTHOMEHUBV2B
 endef
 TARGET_DEVICES += bt_homehub-v2b
@@ -213,7 +213,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-basic
+	kmod-ath5k wpad-basic-wolfssl
   SUPPORTED_DEVICES += GIGASX76X
 endef
 TARGET_DEVICES += siemens_gigaset-sx76x
diff --git a/target/linux/lantiq/image/tp-link.mk b/target/linux/lantiq/image/tp-link.mk
index 2f9fa7b97fb7..cebdf46e1296 100644
--- a/target/linux/lantiq/image/tp-link.mk
+++ b/target/linux/lantiq/image/tp-link.mk
@@ -20,7 +20,7 @@  define Device/tplink_tdw8970
   TPLINK_HWID := 0x89700001
   TPLINK_HWREV := 1
   IMAGE_SIZE := 7680k
-  DEVICE_PACKAGES:= kmod-ath9k wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES:= kmod-ath9k wpad-basic-wolfssl kmod-usb-dwc2 kmod-usb-ledtrig-usbport
   SUPPORTED_DEVICES += TDW8970
 endef
 TARGET_DEVICES += tplink_tdw8970
@@ -33,7 +33,7 @@  define Device/tplink_tdw8980
   TPLINK_HWID := 0x89800001
   TPLINK_HWREV := 14
   IMAGE_SIZE := 7680k
-  DEVICE_PACKAGES:= kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES:= kmod-ath9k kmod-owl-loader wpad-basic-wolfssl kmod-usb-dwc2 kmod-usb-ledtrig-usbport
   SUPPORTED_DEVICES += TDW8980
 endef
 TARGET_DEVICES += tplink_tdw8980
@@ -46,7 +46,7 @@  define Device/tplink_vr200
   TPLINK_HWID := 0x63e64801
   TPLINK_HWREV := 0x53
   IMAGE_SIZE := 15808k
-  DEVICE_PACKAGES:= kmod-mt76x0e wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES:= kmod-mt76x0e wpad-basic-wolfssl kmod-usb-dwc2 kmod-usb-ledtrig-usbport
   SUPPORTED_DEVICES += VR200
 endef
 TARGET_DEVICES += tplink_vr200
@@ -59,7 +59,7 @@  define Device/tplink_vr200v
   TPLINK_HWID := 0x73b70801
   TPLINK_HWREV := 0x2f
   IMAGE_SIZE := 15808k
-  DEVICE_PACKAGES:= kmod-mt76x0e wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-ltq-tapi kmod-ltq-vmmc
+  DEVICE_PACKAGES:= kmod-mt76x0e wpad-basic-wolfssl kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-ltq-tapi kmod-ltq-vmmc
   SUPPORTED_DEVICES += VR200v
 endef
 TARGET_DEVICES += tplink_vr200v
diff --git a/target/linux/lantiq/image/vr9.mk b/target/linux/lantiq/image/vr9.mk
index 42671010724e..e5ebbd3b65bc 100644
--- a/target/linux/lantiq/image/vr9.mk
+++ b/target/linux/lantiq/image/vr9.mk
@@ -43,7 +43,7 @@  define Device/arcadyan_vgv7510kw22-brn
   SIGNATURE := BRNDA6431
   MAGIC := 0x12345678
   CRC32_POLY := 0x04c11db7
-  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
+  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-wolfssl kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
   SUPPORTED_DEVICES += VGV7510KW22BRN
 endef
 TARGET_DEVICES += arcadyan_vgv7510kw22-brn
@@ -56,7 +56,7 @@  define Device/arcadyan_vgv7510kw22-nor
   DEVICE_ALT0_MODEL := Box 6431
   DEVICE_ALT0_VARIANT := NOR
   IMAGE_SIZE := 15232k
-  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
+  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-wolfssl kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
   SUPPORTED_DEVICES += VGV7510KW22NOR
 endef
 TARGET_DEVICES += arcadyan_vgv7510kw22-nor
@@ -73,7 +73,7 @@  define Device/arcadyan_vgv7519-brn
   SIGNATURE := 5D00008000
   MAGIC := 0x12345678
   CRC32_POLY := 0x2083b8ed
-  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
+  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-wolfssl kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
   SUPPORTED_DEVICES += VGV7519BRN
 endef
 TARGET_DEVICES += arcadyan_vgv7519-brn
@@ -86,7 +86,7 @@  define Device/arcadyan_vgv7519-nor
   DEVICE_ALT0_MODEL := Experiabox 8
   DEVICE_ALT0_VARIANT := NOR
   IMAGE_SIZE := 15360k
-  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
+  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-wolfssl kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
   SUPPORTED_DEVICES += VGV7519NOR
 endef
 TARGET_DEVICES += arcadyan_vgv7519-nor
@@ -101,7 +101,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-basic kmod-usb-dwc2 fritz-tffs
+  DEVICE_PACKAGES := kmod-ath9k wpad-basic-wolfssl kmod-usb-dwc2 fritz-tffs
 endef
 
 define Device/avm_fritz3370-rev2-hynix
@@ -122,7 +122,7 @@  define Device/avm_fritz7360sl
   $(Device/AVM)
   DEVICE_MODEL := FRITZ!Box 7360 SL
   IMAGE_SIZE := 15744k
-  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2
+  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-wolfssl kmod-usb-dwc2
   SUPPORTED_DEVICES += FRITZ7360SL
 endef
 TARGET_DEVICES += avm_fritz7360sl
@@ -132,7 +132,7 @@  define Device/avm_fritz7360-v2
   DEVICE_MODEL := FRITZ!Box 7360
   DEVICE_VARIANT := v2
   IMAGE_SIZE := 32128k
-  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2
+  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-wolfssl kmod-usb-dwc2
 endef
 TARGET_DEVICES += avm_fritz7360-v2
 
@@ -142,7 +142,7 @@  define Device/avm_fritz7362sl
   DEVICE_MODEL := FRITZ!Box 7362 SL
   KERNEL_SIZE := 4096k
   IMAGE_SIZE := 49152k
-  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 fritz-tffs
+  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-wolfssl kmod-usb-dwc2 fritz-tffs
 endef
 TARGET_DEVICES += avm_fritz7362sl
 
@@ -153,7 +153,7 @@  define Device/avm_fritz7412
   BOARD_NAME := FRITZ7412
   KERNEL_SIZE := 4096k
   IMAGE_SIZE := 49152k
-  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic fritz-tffs-nand fritz-caldata
+  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-wolfssl fritz-tffs-nand fritz-caldata
 endef
 TARGET_DEVICES += avm_fritz7412
 
@@ -164,7 +164,7 @@  define Device/bt_homehub-v5a
   DEVICE_VARIANT := Type A
   BOARD_NAME := BTHOMEHUBV5A
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader \
-	kmod-ath10k-ct ath10k-firmware-qca988x-ct wpad-basic kmod-usb-dwc2
+	kmod-ath10k-ct ath10k-firmware-qca988x-ct wpad-basic-wolfssl kmod-usb-dwc2
   SUPPORTED_DEVICES += BTHOMEHUBV5A
 endef
 TARGET_DEVICES += bt_homehub-v5a
@@ -173,7 +173,7 @@  define Device/buffalo_wbmr-300hpd
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := WBMR-300HPD
   IMAGE_SIZE := 15616k
-  DEVICE_PACKAGES := kmod-mt7603 wpad-basic kmod-usb-dwc2
+  DEVICE_PACKAGES := kmod-mt7603 wpad-basic-wolfssl kmod-usb-dwc2
   SUPPORTED_DEVICES += WBMR300
 endef
 TARGET_DEVICES += buffalo_wbmr-300hpd
@@ -184,7 +184,7 @@  define Device/lantiq_easy80920-nand
   DEVICE_MODEL := VR9 EASY80920
   DEVICE_VARIANT := NAND
   IMAGE_SIZE := 64512k
-  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-wolfssl kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += lantiq_easy80920-nand
 
@@ -193,7 +193,7 @@  define Device/lantiq_easy80920-nor
   DEVICE_MODEL := VR9 EASY80920
   DEVICE_VARIANT := NOR
   IMAGE_SIZE := 7936k
-  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-wolfssl kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += lantiq_easy80920-nor
 
@@ -218,7 +218,7 @@  define Device/zyxel_p-2812hnu-f1
   DEVICE_MODEL := P-2812HNU
   DEVICE_VARIANT := F1
   BOARD_NAME := P2812HNUF1
-  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-wolfssl kmod-usb-dwc2 kmod-usb-ledtrig-usbport
   KERNEL_SIZE := 3072k
   SUPPORTED_DEVICES += P2812HNUF1
 endef
@@ -230,7 +230,7 @@  define Device/zyxel_p-2812hnu-f3
   DEVICE_MODEL := P-2812HNU
   DEVICE_VARIANT := F3
   BOARD_NAME := P2812HNUF3
-  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2
+  DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-wolfssl kmod-usb-dwc2
   SUPPORTED_DEVICES += P2812HNUF3
 endef
 TARGET_DEVICES += zyxel_p-2812hnu-f3
diff --git a/target/linux/lantiq/image/xway_legacy.mk b/target/linux/lantiq/image/xway_legacy.mk
index 52a29ab2f0ee..885e62863f1f 100644
--- a/target/linux/lantiq/image/xway_legacy.mk
+++ b/target/linux/lantiq/image/xway_legacy.mk
@@ -6,7 +6,7 @@  define Device/arcadyan_arv4518pwr01
 	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-wolfssl
   SUPPORTED_DEVICES += ARV4518PWR01
 endef
 TARGET_DEVICES += arcadyan_arv4518pwr01
@@ -19,7 +19,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-basic
+	kmod-ath5k wpad-basic-wolfssl
   SUPPORTED_DEVICES += ARV4518PWR01A
 endef
 TARGET_DEVICES += arcadyan_arv4518pwr01a
@@ -36,7 +36,7 @@  define Device/arcadyan_arv4520pw
 	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-rt61-pci wpad-mini
+	kmod-rt61-pci wpad-basic-wolfssl
   SUPPORTED_DEVICES += ARV4520PW
 endef
 TARGET_DEVICES += arcadyan_arv4520pw
@@ -48,7 +48,7 @@  define Device/arcadyan_arv4525pw
   DEVICE_ALT0_MODEL := Speedport W502V
   DEVICE_ALT0_VARIANT := Typ A
   IMAGE_SIZE := 3776k
-  DEVICE_PACKAGES := kmod-ath5k wpad-mini \
+  DEVICE_PACKAGES := kmod-ath5k wpad-basic-wolfssl \
 	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
@@ -63,7 +63,7 @@  define Device/arcadyan_arv452cqw
   DEVICE_ALT0_MODEL := Easybox 801
   IMAGE_SIZE := 3776k
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
-	kmod-ath5k wpad-mini \
+	kmod-ath5k wpad-basic-wolfssl \
 	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
diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile
index 3a1f50b77f89..3f2c92c766ad 100644
--- a/target/linux/malta/Makefile
+++ b/target/linux/malta/Makefile
@@ -17,6 +17,6 @@  KERNEL_PATCHVER:=5.4
 
 include $(INCLUDE_DIR)/target.mk
 
-DEFAULT_PACKAGES += wpad-basic kmod-mac80211-hwsim kmod-pcnet32 mkf2fs e2fsprogs
+DEFAULT_PACKAGES += wpad-basic-wolfssl kmod-mac80211-hwsim kmod-pcnet32 mkf2fs e2fsprogs
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/mediatek/mt7622/target.mk b/target/linux/mediatek/mt7622/target.mk
index dd4459724e9b..cb5a6b48cd9b 100644
--- a/target/linux/mediatek/mt7622/target.mk
+++ b/target/linux/mediatek/mt7622/target.mk
@@ -2,7 +2,7 @@  ARCH:=aarch64
 SUBTARGET:=mt7622
 BOARDNAME:=MT7622
 CPU_TYPE:=cortex-a53
-DEFAULT_PACKAGES += kmod-mt7615e kmod-mt7615-firmware wpad-basic
+DEFAULT_PACKAGES += kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl
 KERNELNAME:=Image dtbs
 
 define Target/Description
diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile
index 2ffdfeddcd98..94384a8866a1 100644
--- a/target/linux/mpc85xx/Makefile
+++ b/target/linux/mpc85xx/Makefile
@@ -21,6 +21,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-basic kmod-usb2
+	kmod-leds-gpio swconfig kmod-ath9k wpad-basic-wolfssl kmod-usb2
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/mvebu/image/cortexa9.mk b/target/linux/mvebu/image/cortexa9.mk
index 6ab4e6abc1cf..08ea5b3b6ae2 100644
--- a/target/linux/mvebu/image/cortexa9.mk
+++ b/target/linux/mvebu/image/cortexa9.mk
@@ -31,7 +31,7 @@  define Device/cznic_turris-omnia
   KERNEL_INITRAMFS := kernel-bin
   DEVICE_PACKAGES :=  \
     mkf2fs e2fsprogs kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \
-    wpad-basic kmod-ath9k kmod-ath10k-ct ath10k-firmware-qca988x-ct \
+    wpad-basic-wolfssl kmod-ath9k kmod-ath10k-ct ath10k-firmware-qca988x-ct \
     partx-utils kmod-i2c-mux-pca954x
   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
@@ -68,7 +68,7 @@  TARGET_DEVICES += kobol_helios4
 define Device/linksys
   $(Device/NAND-128K)
   DEVICE_VENDOR := Linksys
-  DEVICE_PACKAGES := kmod-mwlwifi wpad-basic
+  DEVICE_PACKAGES := kmod-mwlwifi wpad-basic-wolfssl
   IMAGES += factory.img
   IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | \
 	append-ubi | pad-to $$$$(PAGESIZE)
diff --git a/target/linux/omap/profiles/00-default.mk b/target/linux/omap/profiles/00-default.mk
index 37c0761029f1..fd7e441c3daf 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-basic
+	wpad-basic-wolfssl
   PRIORITY := 1
 endef
 
diff --git a/target/linux/oxnas/image/ox820.mk b/target/linux/oxnas/image/ox820.mk
index 2a9295bd9719..f00cfe86080e 100644
--- a/target/linux/oxnas/image/ox820.mk
+++ b/target/linux/oxnas/image/ox820.mk
@@ -51,7 +51,7 @@  define Device/cloudengines_pogoplugpro
   DEVICE_MODEL := PogoPlug Pro (with mPCIe)
   SUPPORTED_DEVICES += pogoplug-pro
   DEVICE_PACKAGES := kmod-usb2-oxnas kmod-usb-ledtrig-usbport \
-	kmod-ata-oxnas-sata kmod-rt2800-pci wpad-basic
+	kmod-ata-oxnas-sata kmod-rt2800-pci wpad-basic-wolfssl
 endef
 TARGET_DEVICES += cloudengines_pogoplugpro
 
diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk
index 34e2e42c330a..d7c255591063 100644
--- a/target/linux/ramips/image/mt7620.mk
+++ b/target/linux/ramips/image/mt7620.mk
@@ -52,7 +52,7 @@  define Device/alfa-network_tube-e4g
   DEVICE_VENDOR := ALFA Network
   DEVICE_MODEL := Tube-E4G
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci uboot-envtools uqmi -iwinfo \
-	-kmod-rt2800-soc -wpad-basic
+	-kmod-rt2800-soc -wpad-basic-wolfssl
 endef
 TARGET_DEVICES += alfa-network_tube-e4g
 
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 0315822c0b05..06029e709392 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -109,7 +109,7 @@  define Device/adslr_g7
   IMAGE_SIZE := 16064k
   DEVICE_VENDOR := ADSLR
   DEVICE_MODEL := G7
-  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl
 endef
 TARGET_DEVICES += adslr_g7
 
@@ -118,7 +118,7 @@  define Device/afoundry_ew1200
   DEVICE_VENDOR := AFOUNDRY
   DEVICE_MODEL := EW1200
   DEVICE_PACKAGES := kmod-ata-ahci kmod-mt76x2 kmod-mt7603 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-basic
+	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
   SUPPORTED_DEVICES += ew1200
 endef
 TARGET_DEVICES += afoundry_ew1200
@@ -152,7 +152,7 @@  define Device/asus_rt-ac57u
   DEVICE_MODEL := RT-AC57U
   IMAGE_SIZE := 16064k
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-basic
+	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
 endef
 TARGET_DEVICES += asus_rt-ac57u
 
@@ -168,7 +168,7 @@  define Device/asus_rt-ac65p
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \
 	check-size
-  DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware wpad-basic uboot-envtools
+  DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl uboot-envtools
 endef
 TARGET_DEVICES += asus_rt-ac65p
 
@@ -184,7 +184,7 @@  define Device/asus_rt-ac85p
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \
 	check-size
-  DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware wpad-basic uboot-envtools
+  DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl uboot-envtools
 endef
 TARGET_DEVICES += asus_rt-ac85p
 
@@ -194,7 +194,7 @@  define Device/buffalo_wsr-1166dhp
   IMAGE_SIZE := 15936k
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := WSR-1166DHP
-  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic
+  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic-wolfssl
   SUPPORTED_DEVICES += wsr-1166
 endef
 TARGET_DEVICES += buffalo_wsr-1166dhp
@@ -207,7 +207,7 @@  define Device/buffalo_wsr-2533dhpl
   DEVICE_ALT0_VENDOR := Buffalo
   DEVICE_ALT0_MODEL := WSR-2533DHP
   IMAGE/sysupgrade.bin := trx | pad-rootfs | append-metadata
-  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl
 endef
 TARGET_DEVICES += buffalo_wsr-2533dhpl
 
@@ -215,7 +215,7 @@  define Device/buffalo_wsr-600dhp
   IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := WSR-600DHP
-  DEVICE_PACKAGES := kmod-mt7603 kmod-rt2800-pci wpad-basic
+  DEVICE_PACKAGES := kmod-mt7603 kmod-rt2800-pci wpad-basic-wolfssl
   SUPPORTED_DEVICES += wsr-600
 endef
 TARGET_DEVICES += buffalo_wsr-600dhp
@@ -223,7 +223,7 @@  TARGET_DEVICES += buffalo_wsr-600dhp
 define Device/dlink_dir-8xx-a1
   IMAGE_SIZE := 16000k
   DEVICE_VENDOR := D-Link
-  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl
   KERNEL_INITRAMFS := $$(KERNEL) | uimage-padhdr 96
   IMAGES += factory.bin
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | uimage-padhdr 96 |\
@@ -243,7 +243,7 @@  define Device/dlink_dir-860l-b1
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DIR-860L
   DEVICE_VARIANT := B1
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic-wolfssl
   SUPPORTED_DEVICES += dir-860l-b1
 endef
 TARGET_DEVICES += dlink_dir-860l-b1
@@ -276,7 +276,7 @@  define Device/d-team_newifi-d2
   DEVICE_VENDOR := Newifi
   DEVICE_MODEL := D2
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-basic
+	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
 endef
 TARGET_DEVICES += d-team_newifi-d2
 
@@ -285,7 +285,7 @@  define Device/d-team_pbr-m1
   DEVICE_VENDOR := PandoraBox
   DEVICE_MODEL := PBR-M1
   DEVICE_PACKAGES := kmod-ata-ahci kmod-mt7603 kmod-mt76x2 kmod-sdhci-mt7620 \
-	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic-wolfssl
   SUPPORTED_DEVICES += pbr-m1
 endef
 TARGET_DEVICES += d-team_pbr-m1
@@ -300,7 +300,7 @@  define Device/edimax_ra21s
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \
 	elx-header 02020040 8844A2D168B45A2D
-  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl
 endef
 TARGET_DEVICES += edimax_ra21s
 
@@ -318,7 +318,7 @@  define Device/edimax_re23s
   IMAGE/factory.bin := append-kernel | append-rootfs | \
 	edimax-header -s CSYS -m RN76 -f 0x70000 -S 0x01100000 | pad-rootfs | \
 	check-size
-  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl
 endef
 TARGET_DEVICES += edimax_re23s
 
@@ -330,7 +330,7 @@  define Device/edimax_rg21s
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \
 	elx-header 02020038 8844A2D168B45A2D
-  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl
 endef
 TARGET_DEVICES += edimax_rg21s
 
@@ -341,7 +341,7 @@  define Device/elecom_wrc-1167ghbk2-s
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \
 	elecom-wrc-factory WRC-1167GHBK2-S 0.00
-  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl
 endef
 TARGET_DEVICES += elecom_wrc-1167ghbk2-s
 
@@ -351,7 +351,7 @@  define Device/elecom_wrc-gs
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \
 	elecom-wrc-gs-factory $$$$(ELECOM_HWNAME) 0.00
-  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl
 endef
 
 define Device/elecom_wrc-1750gs
@@ -398,7 +398,7 @@  define Device/firefly_firewrt
   IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Firefly
   DEVICE_MODEL := FireWRT
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic-wolfssl
   SUPPORTED_DEVICES += firewrt
 endef
 TARGET_DEVICES += firefly_firewrt
@@ -408,7 +408,7 @@  define Device/gehua_ghl-r-001
   DEVICE_VENDOR := GeHua
   DEVICE_MODEL := GHL-R-001
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-basic
+	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
 endef
 TARGET_DEVICES += gehua_ghl-r-001
 
@@ -440,7 +440,7 @@  define Device/hiwifi_hc5962
 	check-size
   DEVICE_VENDOR := HiWiFi
   DEVICE_MODEL := HC5962
-  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 wpad-basic
+  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 wpad-basic-wolfssl
 endef
 TARGET_DEVICES += hiwifi_hc5962
 
@@ -451,7 +451,7 @@  define Device/iodata_wn-ax1167gr
 	iodata-factory 7864320 4 0x1055 $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.bin
   DEVICE_VENDOR := I-O DATA
   DEVICE_MODEL := WN-AX1167GR
-  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic
+  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic-wolfssl
 endef
 TARGET_DEVICES += iodata_wn-ax1167gr
 
@@ -473,7 +473,7 @@  define Device/iodata_wn-ax1167gr2
   DEVICE_MODEL := WN-AX1167GR2
   KERNEL_INITRAMFS := $(KERNEL_DTB) | loader-kernel | lzma | \
 	custom-initramfs-uimage 3.10(XBC.1)b10 | iodata-mstc-header
-  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl
 endef
 TARGET_DEVICES += iodata_wn-ax1167gr2
 
@@ -483,7 +483,7 @@  define Device/iodata_wn-ax2033gr
   DEVICE_MODEL := WN-AX2033GR
   KERNEL_INITRAMFS := $(KERNEL_DTB) | loader-kernel | lzma | \
 	custom-initramfs-uimage 3.10(VST.1)C10 | iodata-mstc-header
-  DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7615-firmware wpad-basic
+  DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl
 endef
 TARGET_DEVICES += iodata_wn-ax2033gr
 
@@ -493,7 +493,7 @@  define Device/iodata_wn-dx1167r
   DEVICE_MODEL := WN-DX1167R
   KERNEL_INITRAMFS := $(KERNEL_DTB) | loader-kernel | lzma | \
 	custom-initramfs-uimage 3.10(XIK.1)b10 | iodata-mstc-header
-  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl
 endef
 TARGET_DEVICES += iodata_wn-dx1167r
 
@@ -502,7 +502,7 @@  define Device/iodata_wn-gx300gr
   IMAGE_SIZE := 7616k
   DEVICE_VENDOR := I-O DATA
   DEVICE_MODEL := WN-GX300GR
-  DEVICE_PACKAGES := kmod-mt7603 wpad-basic
+  DEVICE_PACKAGES := kmod-mt7603 wpad-basic-wolfssl
 endef
 TARGET_DEVICES += iodata_wn-gx300gr
 
@@ -514,7 +514,7 @@  define Device/iodata_wnpr2600g
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \
 	elx-header 0104003a 8844A2D168B45A2D
-  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl
 endef
 TARGET_DEVICES += iodata_wnpr2600g
 
@@ -523,7 +523,7 @@  define Device/iptime_a6ns-m
   UIMAGE_NAME := a6nm
   DEVICE_VENDOR := ipTIME
   DEVICE_MODEL := A6ns-M
-  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic-wolfssl
 endef
 TARGET_DEVICES += iptime_a6ns-m
 
@@ -532,7 +532,7 @@  define Device/iptime_a8004t
   UIMAGE_NAME := a8004t
   DEVICE_VENDOR := ipTIME
   DEVICE_MODEL := A8004T
-  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 wpad-basic
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 wpad-basic-wolfssl
 endef
 TARGET_DEVICES += iptime_a8004t
 
@@ -543,7 +543,7 @@  define Device/jcg_jhr-ac876m
   JCG_MAXSIZE := 16064k
   DEVICE_VENDOR := JCG
   DEVICE_MODEL := JHR-AC876M
-  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic-wolfssl
 endef
 TARGET_DEVICES += jcg_jhr-ac876m
 
@@ -553,7 +553,7 @@  define Device/lenovo_newifi-d1
   DEVICE_VENDOR := Newifi
   DEVICE_MODEL := D1
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-sdhci-mt7620 \
-	kmod-usb-ledtrig-usbport wpad-basic
+	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
   SUPPORTED_DEVICES += newifi-d1
 endef
 TARGET_DEVICES += lenovo_newifi-d1
@@ -565,7 +565,7 @@  define Device/linksys_ea7xxx
   KERNEL_SIZE := 4096k
   IMAGE_SIZE := 36864k
   DEVICE_VENDOR := Linksys
-  DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware wpad-basic \
+  DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl \
 	uboot-envtools
   UBINIZE_OPTS := -E 5
   IMAGES := sysupgrade.bin factory.bin
@@ -594,7 +594,7 @@  define Device/linksys_re6500
   IMAGE_SIZE := 7872k
   DEVICE_VENDOR := Linksys
   DEVICE_MODEL := RE6500
-  DEVICE_PACKAGES := kmod-mt76x2 wpad-basic
+  DEVICE_PACKAGES := kmod-mt76x2 wpad-basic-wolfssl
   SUPPORTED_DEVICES += re6500
 endef
 TARGET_DEVICES += linksys_re6500
@@ -655,7 +655,7 @@  define Device/mqmaker_witi
   DEVICE_VENDOR := MQmaker
   DEVICE_MODEL := WiTi
   DEVICE_PACKAGES := kmod-ata-ahci kmod-mt76x2 kmod-sdhci-mt7620 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-basic
+	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
   SUPPORTED_DEVICES += witi mqmaker,witi-256m mqmaker,witi-512m
 endef
 TARGET_DEVICES += mqmaker_witi
@@ -666,14 +666,14 @@  define Device/mtc_wr1201
   DEVICE_MODEL := Wireless Router WR1201
   KERNEL_INITRAMFS := $(KERNEL_DTB) | custom-initramfs-uimage WR1201_8_128
   DEVICE_PACKAGES := kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-basic
+	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
 endef
 TARGET_DEVICES += mtc_wr1201
 
 define Device/netgear_ex6150
   DEVICE_VENDOR := NETGEAR
   DEVICE_MODEL := EX6150
-  DEVICE_PACKAGES := kmod-mt76x2 wpad-basic
+  DEVICE_PACKAGES := kmod-mt76x2 wpad-basic-wolfssl
   NETGEAR_BOARD_ID := U12H318T00_NETGEAR
   IMAGE_SIZE := 14848k
   IMAGES += factory.chk
@@ -695,7 +695,7 @@  define Device/netgear_sercomm_nand
   IMAGE/kernel.bin := append-kernel
   IMAGE/rootfs.bin := append-ubi | check-size
   DEVICE_VENDOR := NETGEAR
-  DEVICE_PACKAGES := kmod-mt7603 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+  DEVICE_PACKAGES := kmod-mt7603 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic-wolfssl
 endef
 
 define Device/netgear_r6220
@@ -821,7 +821,7 @@  define Device/netgear_wndr3700-v5
   DEVICE_MODEL := WNDR3700
   DEVICE_VARIANT := v5
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-basic
+	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
   SUPPORTED_DEVICES += wndr3700v5
 endef
 TARGET_DEVICES += netgear_wndr3700-v5
@@ -841,7 +841,7 @@  define Device/netis_wf2881
 	check-size
   DEVICE_VENDOR := NETIS
   DEVICE_MODEL := WF2881
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic-wolfssl
 endef
 TARGET_DEVICES += netis_wf2881
 
@@ -852,7 +852,7 @@  define Device/phicomm_k2p
   DEVICE_ALT0_VENDOR := Phicomm
   DEVICE_ALT0_MODEL := KE 2P
   SUPPORTED_DEVICES += k2p
-  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl
 endef
 TARGET_DEVICES += phicomm_k2p
 
@@ -871,7 +871,7 @@  define Device/samknows_whitebox-v8
   DEVICE_VENDOR := SamKnows
   DEVICE_MODEL := Whitebox 8
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
-	kmod-usb-ledtrig-usbport uboot-envtools wpad-basic
+	kmod-usb-ledtrig-usbport uboot-envtools wpad-basic-wolfssl
   SUPPORTED_DEVICES += sk-wb8
 endef
 TARGET_DEVICES += samknows_whitebox-v8
@@ -880,7 +880,7 @@  define Device/storylink_sap-g3200u3
   IMAGE_SIZE := 7872k
   DEVICE_VENDOR := STORYLiNK
   DEVICE_MODEL := SAP-G3200U3
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic-wolfssl
   SUPPORTED_DEVICES += sap-g3200u3
 endef
 TARGET_DEVICES += storylink_sap-g3200u3
@@ -889,7 +889,7 @@  define Device/telco-electronics_x1
   IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Telco Electronics
   DEVICE_MODEL := X1
-  DEVICE_PACKAGES := kmod-usb3 kmod-mt76 wpad-basic
+  DEVICE_PACKAGES := kmod-usb3 kmod-mt76 wpad-basic-wolfssl
 endef
 TARGET_DEVICES += telco-electronics_x1
 
@@ -908,7 +908,7 @@  define Device/totolink_a7000r
   UIMAGE_NAME := C8340R1C-9999
   DEVICE_VENDOR := TOTOLINK
   DEVICE_MODEL := A7000R
-  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl
 endef
 TARGET_DEVICES += totolink_a7000r
 
@@ -916,7 +916,7 @@  define Device/tplink_re350-v1
   $(Device/tplink-safeloader)
   DEVICE_MODEL := RE350
   DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic
+  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic-wolfssl
   TPLINK_BOARD_ID := RE350-V1
   IMAGE_SIZE := 6016k
   SUPPORTED_DEVICES += re350-v1
@@ -927,7 +927,7 @@  define Device/tplink_re500-v1
   $(Device/tplink-safeloader)
   DEVICE_MODEL := RE500
   DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl
   TPLINK_BOARD_ID := RE500-V1
   IMAGE_SIZE := 14208k
 endef
@@ -937,7 +937,7 @@  define Device/tplink_re650-v1
   $(Device/tplink-safeloader)
   DEVICE_MODEL := RE650
   DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl
   TPLINK_BOARD_ID := RE650-V1
   IMAGE_SIZE := 14208k
 endef
@@ -972,7 +972,7 @@  TARGET_DEVICES += ubnt_edgerouter-x-sfp
 define Device/ubnt_unifi-nanohd
   DEVICE_VENDOR := Ubiquiti
   DEVICE_MODEL := UniFi nanoHD
-  DEVICE_PACKAGES += kmod-mt7603 kmod-mt7615e kmod-mt7615-firmware wpad-basic
+  DEVICE_PACKAGES += kmod-mt7603 kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl
   IMAGE_SIZE := 15552k
 endef
 TARGET_DEVICES += ubnt_unifi-nanohd
@@ -1003,7 +1003,7 @@  define Device/wevo_11acnas
   DEVICE_VENDOR := WeVO
   DEVICE_MODEL := 11AC NAS Router
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-basic
+	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
   SUPPORTED_DEVICES += 11acnas
 endef
 TARGET_DEVICES += wevo_11acnas
@@ -1015,7 +1015,7 @@  define Device/wevo_w2914ns-v2
   DEVICE_MODEL := W2914NS
   DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-basic
+	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
   SUPPORTED_DEVICES += w2914nsv2
 endef
 TARGET_DEVICES += wevo_w2914ns-v2
@@ -1032,7 +1032,7 @@  define Device/xiaomi-ac2100
   IMAGE/rootfs0.bin := append-ubi | check-size
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   DEVICE_VENDOR := Xiaomi
-  DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7615-firmware wpad-basic uboot-envtools
+  DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl uboot-envtools
 endef
 
 define Device/xiaomi_mi-router-ac2100
@@ -1057,7 +1057,7 @@  define Device/xiaomi_mir3g
   SUPPORTED_DEVICES += R3G
   SUPPORTED_DEVICES += mir3g
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-basic uboot-envtools
+	kmod-usb-ledtrig-usbport wpad-basic-wolfssl uboot-envtools
 endef
 TARGET_DEVICES += xiaomi_mir3g
 
@@ -1070,7 +1070,7 @@  define Device/xiaomi_mir3g-v2
   DEVICE_ALT0_VENDOR := Xiaomi
   DEVICE_ALT0_MODEL := Mi Router 4A
   DEVICE_ALT0_VARIANT := Gigabit Edition
-  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic
+  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic-wolfssl
 endef
 TARGET_DEVICES += xiaomi_mir3g-v2
 
@@ -1088,7 +1088,7 @@  define Device/xiaomi_mir3p
   IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \
 	check-size
   DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 kmod-usb-ledtrig-usbport \
-	wpad-basic uboot-envtools
+	wpad-basic-wolfssl uboot-envtools
 endef
 TARGET_DEVICES += xiaomi_mir3p
 
@@ -1120,7 +1120,7 @@  define Device/youhua_wr1200js
   DEVICE_VENDOR := YouHua
   DEVICE_MODEL := WR1200JS
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-basic
+	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
 endef
 TARGET_DEVICES += youhua_wr1200js
 
@@ -1129,7 +1129,7 @@  define Device/youku_yk-l2
   DEVICE_VENDOR := Youku
   DEVICE_MODEL := YK-L2
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-basic
+	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
 endef
 TARGET_DEVICES += youku_yk-l2
 
@@ -1138,7 +1138,7 @@  define Device/zbtlink_zbt-we1326
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-WE1326
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-sdhci-mt7620 \
-	wpad-basic
+	wpad-basic-wolfssl
   SUPPORTED_DEVICES += zbt-we1326
 endef
 TARGET_DEVICES += zbtlink_zbt-we1326
@@ -1148,7 +1148,7 @@  define Device/zbtlink_zbt-we3526
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-WE3526
   DEVICE_PACKAGES := kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-basic
+	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
 endef
 TARGET_DEVICES += zbtlink_zbt-we3526
 
@@ -1157,7 +1157,7 @@  define Device/zbtlink_zbt-wg2626
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-WG2626
   DEVICE_PACKAGES := kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-basic
+	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
   SUPPORTED_DEVICES += zbt-wg2626
 endef
 TARGET_DEVICES += zbtlink_zbt-wg2626
@@ -1168,7 +1168,7 @@  define Device/zbtlink_zbt-wg3526-16m
   DEVICE_MODEL := ZBT-WG3526
   DEVICE_VARIANT := 16M
   DEVICE_PACKAGES := kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \
-	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic-wolfssl
   SUPPORTED_DEVICES += zbt-wg3526 zbt-wg3526-16M
 endef
 TARGET_DEVICES += zbtlink_zbt-wg3526-16m
@@ -1179,7 +1179,7 @@  define Device/zbtlink_zbt-wg3526-32m
   DEVICE_MODEL := ZBT-WG3526
   DEVICE_VARIANT := 32M
   DEVICE_PACKAGES := kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \
-	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic-wolfssl
   SUPPORTED_DEVICES += ac1200pro zbt-wg3526-32M
 endef
 TARGET_DEVICES += zbtlink_zbt-wg3526-32m
@@ -1189,7 +1189,7 @@  define Device/zio_freezio
   DEVICE_VENDOR := ZIO
   DEVICE_MODEL := FREEZIO
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
-	kmod-usb-ledtrig-usbport wpad-basic
+	kmod-usb-ledtrig-usbport wpad-basic-wolfssl
 endef
 TARGET_DEVICES += zio_freezio
 
@@ -1201,7 +1201,7 @@  define Device/zyxel_wap6805
   IMAGE_SIZE := 32448k
   DEVICE_VENDOR := ZyXEL
   DEVICE_MODEL := WAP6805
-  DEVICE_PACKAGES := kmod-mt7603 wpad-basic kmod-mt7621-qtn-rgmii
+  DEVICE_PACKAGES := kmod-mt7603 wpad-basic-wolfssl kmod-mt7621-qtn-rgmii
   KERNEL := $(KERNEL_DTB) | uImage lzma | uimage-padhdr 160
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
 endef
diff --git a/target/linux/ramips/mt7620/target.mk b/target/linux/ramips/mt7620/target.mk
index ff890c554095..5cc325962501 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 ramdisk
 CPU_TYPE:=24kc
 
-DEFAULT_PACKAGES += kmod-rt2800-soc wpad-basic swconfig
+DEFAULT_PACKAGES += kmod-rt2800-soc wpad-basic-wolfssl swconfig
 
 KERNEL_PATCHVER:=5.4
 
diff --git a/target/linux/ramips/mt76x8/target.mk b/target/linux/ramips/mt76x8/target.mk
index 4ecc19ff6202..3781dc72e709 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 ramdisk
 CPU_TYPE:=24kc
 
-DEFAULT_PACKAGES += kmod-mt7603 wpad-basic swconfig
+DEFAULT_PACKAGES += kmod-mt7603 wpad-basic-wolfssl swconfig
 KERNEL_PATCHVER:=5.4
 
 define Target/Description
diff --git a/target/linux/ramips/rt288x/target.mk b/target/linux/ramips/rt288x/target.mk
index 57b0ee22514f..814ac97e8953 100644
--- a/target/linux/ramips/rt288x/target.mk
+++ b/target/linux/ramips/rt288x/target.mk
@@ -7,7 +7,7 @@  BOARDNAME:=RT288x based boards
 FEATURES+=small_flash
 CPU_TYPE:=24kc
 
-DEFAULT_PACKAGES += kmod-rt2800-soc wpad-mini swconfig
+DEFAULT_PACKAGES += kmod-rt2800-soc wpad-basic-wolfssl swconfig
 
 define Target/Description
 	Build firmware images for Ralink RT288x based boards.
diff --git a/target/linux/ramips/rt305x/target.mk b/target/linux/ramips/rt305x/target.mk
index 51edace5921c..27ad670ca440 100644
--- a/target/linux/ramips/rt305x/target.mk
+++ b/target/linux/ramips/rt305x/target.mk
@@ -7,7 +7,7 @@  BOARDNAME:=RT3x5x/RT5350 based boards
 FEATURES+=usb ramdisk small_flash
 CPU_TYPE:=24kc
 
-DEFAULT_PACKAGES += kmod-rt2800-soc wpad-mini swconfig
+DEFAULT_PACKAGES += kmod-rt2800-soc wpad-basic-wolfssl swconfig
 
 define Target/Description
 	Build firmware images for Ralink RT3x5x/RT5350 based boards.
diff --git a/target/linux/ramips/rt3883/target.mk b/target/linux/ramips/rt3883/target.mk
index 4a032f543747..ff878a0a597b 100644
--- a/target/linux/ramips/rt3883/target.mk
+++ b/target/linux/ramips/rt3883/target.mk
@@ -7,7 +7,7 @@  BOARDNAME:=RT3662/RT3883 based boards
 FEATURES+=usb pci small_flash
 CPU_TYPE:=74kc
 
-DEFAULT_PACKAGES += kmod-rt2800-pci kmod-rt2800-soc wpad-mini swconfig
+DEFAULT_PACKAGES += kmod-rt2800-pci kmod-rt2800-soc wpad-basic-wolfssl swconfig
 
 define Target/Description
 	Build firmware images for Ralink RT3662/RT3883 based boards.
diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile
index ed901d2b479d..43ec4cc491fe 100644
--- a/target/linux/rb532/Makefile
+++ b/target/linux/rb532/Makefile
@@ -15,6 +15,6 @@  KERNEL_PATCHVER:=4.14
 
 include $(INCLUDE_DIR)/target.mk
 
-DEFAULT_PACKAGES += wpad-basic kmod-ath5k kmod-input-rb532 e2fsprogs mkf2fs nand-utils
+DEFAULT_PACKAGES += wpad-basic-wolfssl kmod-ath5k kmod-input-rb532 e2fsprogs mkf2fs nand-utils
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/sunxi/image/cortexa7.mk b/target/linux/sunxi/image/cortexa7.mk
index 8fa648176fb8..27dd2d96ff0d 100644
--- a/target/linux/sunxi/image/cortexa7.mk
+++ b/target/linux/sunxi/image/cortexa7.mk
@@ -26,7 +26,7 @@  define Device/friendlyarm_nanopi-m1-plus
   DEVICE_VENDOR := FriendlyARM
   DEVICE_MODEL := NanoPi M1 Plus
   DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-heartbeat \
-	kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic
+	kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic-wolfssl
   SOC := sun8i-h3
 endef
 TARGET_DEVICES += friendlyarm_nanopi-m1-plus
@@ -42,7 +42,7 @@  define Device/friendlyarm_nanopi-neo-air
   DEVICE_VENDOR := FriendlyARM
   DEVICE_MODEL := NanoPi NEO Air
   DEVICE_PACKAGES := kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-heartbeat \
-	kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic
+	kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic-wolfssl
   SOC := sun8i-h3
 endef
 TARGET_DEVICES += friendlyarm_nanopi-neo-air
@@ -50,7 +50,7 @@  TARGET_DEVICES += friendlyarm_nanopi-neo-air
 define Device/lamobo_lamobo-r1
   DEVICE_VENDOR := Lamobo
   DEVICE_MODEL := Lamobo R1
-  DEVICE_PACKAGES:=kmod-ata-sunxi kmod-rtl8192cu swconfig wpad-basic
+  DEVICE_PACKAGES:=kmod-ata-sunxi kmod-rtl8192cu swconfig wpad-basic-wolfssl
   SOC := sun7i-a20
 endef
 TARGET_DEVICES += lamobo_lamobo-r1
@@ -133,7 +133,7 @@  define Device/sinovoip_bananapi-m2-plus
   DEVICE_VENDOR := Sinovoip
   DEVICE_MODEL := Banana Pi M2+
   DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-heartbeat \
-	kmod-brcmfmac brcmfmac-firmware-43430a0-sdio wpad-basic
+	kmod-brcmfmac brcmfmac-firmware-43430a0-sdio wpad-basic-wolfssl
   SOC := sun8i-h3
 endef
 TARGET_DEVICES += sinovoip_bananapi-m2-plus
diff --git a/target/linux/sunxi/profiles/00-default.mk b/target/linux/sunxi/profiles/00-default.mk
index cecdd0b83793..7dc791ecde35 100644
--- a/target/linux/sunxi/profiles/00-default.mk
+++ b/target/linux/sunxi/profiles/00-default.mk
@@ -16,7 +16,7 @@  define Profile/Default
 	kmod-sun4i-emac \
 	rtl8188eu-firmware \
 	swconfig \
-	wpad-basic
+	wpad-basic-wolfssl
   PRIORITY := 1
 endef
 
diff --git a/target/linux/tegra/image/Makefile b/target/linux/tegra/image/Makefile
index 3a19feb55e92..33e7b508d966 100644
--- a/target/linux/tegra/image/Makefile
+++ b/target/linux/tegra/image/Makefile
@@ -50,7 +50,7 @@  define Device/compulab_trimslice
   DEVICE_MODEL := TrimSlice
   DEVICE_DTS := tegra20-trimslice
   DEVICE_PACKAGES := kmod-r8169 kmod-rt2800-usb kmod-rtc-em3027 \
-	kmod-usb-storage wpad-mini
+	kmod-usb-storage wpad-basic-wolfssl
   UBOOT := trimslice-mmc
 endef
 TARGET_DEVICES += compulab_trimslice
diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile
index f8b8c8f7e16c..0bfdfe3e1f48 100644
--- a/target/linux/uml/Makefile
+++ b/target/linux/uml/Makefile
@@ -33,7 +33,7 @@  endef
 
 LINUX_TARGET_CONFIG:=$(CURDIR)/config/$(ARCH)
 
-DEFAULT_PACKAGES += wpad-basic kmod-mac80211-hwsim mkf2fs e2fsprogs
+DEFAULT_PACKAGES += wpad-basic-wolfssl kmod-mac80211-hwsim mkf2fs e2fsprogs
 
 endif