target: switch to full feature wpad for devices with big flash sizes

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2025-02-08 19:23:55 +08:00
parent ab378a63c0
commit 53e96e3041
16 changed files with 34 additions and 34 deletions
--- a/target/linux/apm821xx/image/sata.mk
+++ b/target/linux/apm821xx/image/sata.mk
@@ -9,7 +9,7 @@ define Device/wd_mybooklive
  DEVICE_ALT0_VENDOR := Western Digital
  DEVICE_ALT0_MODEL := My Book Live Duo
  DEVICE_PACKAGES := kmod-usb-dwc2 kmod-ata-dwc kmod-usb-ledtrig-usbport \
-	kmod-usb-storage kmod-fs-vfat wpad-basic-openssl
+	kmod-usb-storage kmod-fs-vfat wpad-openssl
  SUPPORTED_DEVICES += mbl wd,mybooklive-duo
  BLOCKSIZE := 1k
  DEVICE_DTC_FLAGS := --pad 4096
--- 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

-DEFAULT_PACKAGES += kmod-ath9k swconfig wpad-basic-openssl
+DEFAULT_PACKAGES += kmod-ath9k swconfig wpad-openssl

 define Target/Description
 	Build firmware images for APM821XX boards with NAND flash.
--- a/target/linux/apm821xx/sata/profiles/00-default.mk
+++ b/target/linux/apm821xx/sata/profiles/00-default.mk
@@ -5,7 +5,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-openssl
+  PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-openssl
 endef

 define Profile/Default/Description
--- 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 += nand

-DEFAULT_PACKAGES += wpad-basic-openssl
+DEFAULT_PACKAGES += wpad-openssl

 define Target/Description
 	Firmware for boards using Qualcomm Atheros, MIPS-based SoCs
--- a/target/linux/bcm27xx/image/Makefile
+++ b/target/linux/bcm27xx/image/Makefile
@@ -88,7 +88,7 @@ define Device/rpi
  DEVICE_PACKAGES := \
 	cypress-firmware-43430-sdio \
 	brcmfmac-nvram-43430-sdio \
-	kmod-brcmfmac wpad-basic-openssl
+	kmod-brcmfmac wpad-openssl
 endef
 ifeq ($(SUBTARGET),bcm2708)
  TARGET_DEVICES += rpi
@@ -127,7 +127,7 @@ define Device/rpi-2
 	brcmfmac-nvram-43430-sdio \
 	cypress-firmware-43455-sdio \
 	brcmfmac-nvram-43455-sdio \
-	kmod-brcmfmac wpad-basic-openssl
+	kmod-brcmfmac wpad-openssl
  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
@@ -161,7 +161,7 @@ define Device/rpi-3
 	brcmfmac-nvram-43430-sdio \
 	cypress-firmware-43455-sdio \
 	brcmfmac-nvram-43455-sdio \
-	kmod-brcmfmac wpad-basic-openssl
+	kmod-brcmfmac wpad-openssl
 endef
 ifeq ($(SUBTARGET),bcm2710)
  TARGET_DEVICES += rpi-3
@@ -182,7 +182,7 @@ define Device/rpi-4
  DEVICE_PACKAGES := \
 	cypress-firmware-43455-sdio \
 	brcmfmac-nvram-43455-sdio \
-	kmod-brcmfmac wpad-basic-openssl \
+	kmod-brcmfmac wpad-openssl \
 	kmod-usb-net-lan78xx \
 	kmod-r8169
  IMAGE/sysupgrade.img.gz := boot-common | boot-2711 | sdcard-img | gzip | append-metadata
@@ -200,7 +200,7 @@ define Device/rpi-5
  DEVICE_PACKAGES := \
 	cypress-firmware-43455-sdio \
 	brcmfmac-nvram-43455-sdio \
-	kmod-brcmfmac wpad-basic-openssl \
+	kmod-brcmfmac wpad-openssl \
 	kmod-hwmon-pwmfan kmod-thermal
  IMAGE/sysupgrade.img.gz := boot-common | sdcard-img | gzip | append-metadata
  IMAGE/factory.img.gz := boot-common | sdcard-img | gzip
--- a/target/linux/bcm53xx/image/Makefile
+++ b/target/linux/bcm53xx/image/Makefile
@@ -135,7 +135,7 @@ DEVICE_VARS += SIGNATURE
 DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_REGION TPLINK_BOARD
 DEVICE_VARS += LUXUL_BOARD

-IEEE8021X := wpad-basic-openssl
+IEEE8021X := wpad-openssl
 B43 := $(IEEE8021X) kmod-b43
 BRCMFMAC_43602A1 := $(IEEE8021X) kmod-brcmfmac brcmfmac-firmware-43602a1-pcie
 BRCMFMAC_4366B1 := $(IEEE8021X) kmod-brcmfmac brcmfmac-firmware-4366b1-pcie
--- a/target/linux/d1/image/Makefile
+++ b/target/linux/d1/image/Makefile
@@ -65,7 +65,7 @@ define Device/sipeed_lichee-rv-dock
  DEVICE_MODEL := LicheePi RV (dock)
  DEVICE_DTS := allwinner/sun20i-d1-lichee-rv-dock
  SUPPORTED_DEVICES += lichee_rv_dock
-  DEVICE_PACKAGES += kmod-rtw88-8723ds wpad-basic-openssl
+  DEVICE_PACKAGES += kmod-rtw88-8723ds wpad-openssl
  UBOOT := lichee_rv_dock
 endef
 TARGET_DEVICES += sipeed_lichee-rv-dock
@@ -76,7 +76,7 @@ define Device/widora_mangopi-mq-pro
  DEVICE_MODEL := MQ Pro
  DEVICE_DTS := allwinner/sun20i-d1-mangopi-mq-pro
  SUPPORTED_DEVICES += mangopi_mq_pro
-  DEVICE_PACKAGES += kmod-rtw88-8723ds wpad-basic-openssl
+  DEVICE_PACKAGES += kmod-rtw88-8723ds wpad-openssl
  UBOOT := mangopi_mq_pro
 endef
 TARGET_DEVICES += widora_mangopi-mq-pro
--- a/target/linux/malta/Makefile
+++ b/target/linux/malta/Makefile
@@ -14,6 +14,6 @@ KERNEL_PATCHVER:=6.6

 include $(INCLUDE_DIR)/target.mk

-DEFAULT_PACKAGES += wpad-basic-openssl kmod-mac80211-hwsim kmod-pcnet32 mkf2fs e2fsprogs
+DEFAULT_PACKAGES += wpad-openssl kmod-mac80211-hwsim kmod-pcnet32 mkf2fs e2fsprogs

 $(eval $(call BuildTarget))
--- a/target/linux/mpc85xx/Makefile
+++ b/target/linux/mpc85xx/Makefile
@@ -19,7 +19,7 @@ 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-openssl kmod-usb2 \
+	kmod-leds-gpio swconfig kmod-ath9k wpad-openssl kmod-usb2 \
 	uboot-envtools kmod-crypto-hw-talitos

 $(eval $(call BuildTarget))
--- a/target/linux/mvebu/image/cortexa9.mk
+++ b/target/linux/mvebu/image/cortexa9.mk
@@ -105,7 +105,7 @@ define Device/cznic_turris-omnia
  KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb
  DEVICE_PACKAGES :=  \
    mkf2fs e2fsprogs kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \
-    wpad-basic-openssl kmod-ath9k kmod-ath10k-ct ath10k-firmware-qca988x-ct \
+    wpad-openssl kmod-ath9k kmod-ath10k-ct ath10k-firmware-qca988x-ct \
    kmod-mt7915-firmware partx-utils kmod-i2c-mux-pca954x kmod-leds-turris-omnia \
    kmod-turris-omnia-mcu kmod-gpio-button-hotplug omnia-eeprom omnia-mcu-firmware \
    omnia-mcutool kmod-dsa-mv88e6xxx
@@ -169,7 +169,7 @@ define Device/fortinet_fwf-50e-2r
  KERNEL_INITRAMFS := kernel-bin | append-dtb | fortigate-header | \
    gzip-filename FW502R
  DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct \
-    wpad-basic-openssl
+    wpad-openssl
 endef
 TARGET_DEVICES += fortinet_fwf-50e-2r

@@ -179,7 +179,7 @@ define Device/fortinet_fwf-51e
  DEVICE_DTS := armada-385-fortinet-fwf-51e
  KERNEL_INITRAMFS := kernel-bin | append-dtb | fortigate-header | \
    gzip-filename FWF51E
-  DEVICE_PACKAGES += kmod-ath9k wpad-basic-openssl
+  DEVICE_PACKAGES += kmod-ath9k wpad-openssl
 endef
 TARGET_DEVICES += fortinet_fwf-51e

@@ -202,7 +202,7 @@ define Device/iij_sa-w2
  IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | \
    append-rootfs | pad-rootfs | check-size | append-metadata
  DEVICE_PACKAGES := kmod-ath9k kmod-ath10k-ct ath10k-firmware-qca988x-ct \
-    wpad-basic-openssl kmod-dsa-mv88e6xxx
+    wpad-openssl kmod-dsa-mv88e6xxx
 endef
 TARGET_DEVICES += iij_sa-w2

@@ -237,7 +237,7 @@ TARGET_DEVICES += kobol_helios4
 define Device/linksys
  $(Device/NAND-128K)
  DEVICE_VENDOR := Linksys
-  DEVICE_PACKAGES := kmod-mwlwifi wpad-basic-openssl
+  DEVICE_PACKAGES := kmod-mwlwifi wpad-openssl
  IMAGES += factory.img
  IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | \
 	append-ubi | pad-to $$$$(PAGESIZE)
--- a/target/linux/omap/profiles/00-default.mk
+++ b/target/linux/omap/profiles/00-default.mk
@@ -8,7 +8,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-openssl
+	wpad-openssl
  PRIORITY := 1
 endef

--- a/target/linux/starfive/image/Makefile
+++ b/target/linux/starfive/image/Makefile
@@ -77,7 +77,7 @@ define Device/visionfive-v1
  DEVICE_VENDOR := StarFive
  DEVICE_MODEL := VisionFive v1
  DEVICE_DTS := starfive/jh7100-starfive-visionfive-v1
-  DEVICE_PACKAGES := kmod-eeprom-at24 kmod-brcmfmac cypress-firmware-43430-sdio wpad-basic-openssl \
+  DEVICE_PACKAGES := kmod-eeprom-at24 kmod-brcmfmac cypress-firmware-43430-sdio wpad-openssl \
  			kmod-usb3 kmod-usb-cdns3-starfive
 endef
 TARGET_DEVICES += visionfive-v1
--- a/target/linux/sunxi/image/cortexa7.mk
+++ b/target/linux/sunxi/image/cortexa7.mk
@@ -25,7 +25,7 @@ define Device/friendlyarm_nanopi-m1-plus
  DEVICE_VENDOR := FriendlyARM
  DEVICE_MODEL := NanoPi M1 Plus
  DEVICE_PACKAGES:=kmod-leds-gpio kmod-brcmfmac \
-	cypress-firmware-43430-sdio wpad-basic-openssl
+	cypress-firmware-43430-sdio wpad-openssl
  SOC := sun8i-h3
 endef
 TARGET_DEVICES += friendlyarm_nanopi-m1-plus
@@ -41,7 +41,7 @@ define Device/friendlyarm_nanopi-neo-air
  DEVICE_VENDOR := FriendlyARM
  DEVICE_MODEL := NanoPi NEO Air
  DEVICE_PACKAGES := kmod-leds-gpio kmod-brcmfmac \
-	brcmfmac-firmware-43430a0-sdio wpad-basic-openssl
+	brcmfmac-firmware-43430a0-sdio wpad-openssl
  SOC := sun8i-h3
 endef
 TARGET_DEVICES += friendlyarm_nanopi-neo-air
@@ -50,7 +50,7 @@ define Device/friendlyarm_nanopi-r1
  DEVICE_VENDOR := FriendlyARM
  DEVICE_MODEL := NanoPi R1
  DEVICE_PACKAGES := kmod-usb-net-rtl8152 kmod-leds-gpio \
-	kmod-brcmfmac cypress-firmware-43430-sdio wpad-basic-openssl
+	kmod-brcmfmac cypress-firmware-43430-sdio wpad-openssl
  SOC := sun8i-h3
 endef
 TARGET_DEVICES += friendlyarm_nanopi-r1
@@ -68,7 +68,7 @@ define Device/lamobo_lamobo-r1
  DEVICE_MODEL := Lamobo R1
  DEVICE_ALT0_VENDOR := Bananapi
  DEVICE_ALT0_MODEL := BPi-R1
-  DEVICE_PACKAGES := kmod-ata-sunxi kmod-rtl8192cu wpad-basic-openssl
+  DEVICE_PACKAGES := kmod-ata-sunxi kmod-rtl8192cu wpad-openssl
  DEVICE_COMPAT_VERSION := 1.1
  DEVICE_COMPAT_MESSAGE := Config cannot be migrated from swconfig to DSA
  SOC := sun7i-a20
@@ -87,7 +87,7 @@ define Device/sinovoip_bananapi-m2-berry
  DEVICE_VENDOR := Sinovoip
  DEVICE_MODEL := Banana Pi M2 Berry
  DEVICE_PACKAGES:=kmod-ata-sunxi kmod-brcmfmac \
-	cypress-firmware-43430-sdio wpad-basic-openssl
+	cypress-firmware-43430-sdio wpad-openssl
  SUPPORTED_DEVICES:=lemaker,bananapi-m2-berry
  SOC := sun8i-v40
 endef
@@ -97,7 +97,7 @@ define Device/sinovoip_bananapi-m2-ultra
  DEVICE_VENDOR := Sinovoip
  DEVICE_MODEL := Banana Pi M2 Ultra
  DEVICE_PACKAGES:=kmod-ata-sunxi kmod-brcmfmac \
-	brcmfmac-firmware-43430a0-sdio wpad-basic-openssl
+	brcmfmac-firmware-43430a0-sdio wpad-openssl
  SUPPORTED_DEVICES:=lemaker,bananapi-m2-ultra
  SOC := sun8i-r40
 endef
@@ -107,7 +107,7 @@ define Device/lemaker_bananapro
  DEVICE_VENDOR := LeMaker
  DEVICE_MODEL := Banana Pro
  DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-sunxi kmod-brcmfmac \
-	cypress-firmware-43362-sdio wpad-basic-openssl
+	cypress-firmware-43362-sdio wpad-openssl
  SOC := sun7i-a20
 endef
 TARGET_DEVICES += lemaker_bananapro
@@ -182,7 +182,7 @@ define Device/sinovoip_bananapi-m2-plus
  DEVICE_VENDOR := Sinovoip
  DEVICE_MODEL := Banana Pi M2+
  DEVICE_PACKAGES:=kmod-leds-gpio kmod-brcmfmac \
-	brcmfmac-firmware-43430a0-sdio wpad-basic-openssl
+	brcmfmac-firmware-43430a0-sdio wpad-openssl
  SOC := sun8i-h3
 endef
 TARGET_DEVICES += sinovoip_bananapi-m2-plus
@@ -191,7 +191,7 @@ define Device/sinovoip_bananapi-m3
  DEVICE_VENDOR := Sinovoip
  DEVICE_MODEL := Banana Pi M3
  DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-leds-gpio kmod-rtc-ac100 \
-	kmod-brcmfmac cypress-firmware-43430-sdio wpad-basic-openssl
+	kmod-brcmfmac cypress-firmware-43430-sdio wpad-openssl
  SOC := sun8i-a83t
 endef
 TARGET_DEVICES += sinovoip_bananapi-m3
@@ -200,7 +200,7 @@ define Device/sinovoip_bananapi-p2-zero
  DEVICE_VENDOR := Sinovoip
  DEVICE_MODEL := Banana Pi P2 Zero
  DEVICE_PACKAGES:=kmod-leds-gpio kmod-brcmfmac \
-	cypress-firmware-43430-sdio wpad-basic-openssl
+	cypress-firmware-43430-sdio wpad-openssl
  SOC := sun8i-h2-plus
 endef
 TARGET_DEVICES += sinovoip_bananapi-p2-zero
--- a/target/linux/sunxi/profiles/00-default.mk
+++ b/target/linux/sunxi/profiles/00-default.mk
@@ -13,7 +13,7 @@ define Profile/Default
 	kmod-sun4i-emac \
 	rtl8188eu-firmware \
 	swconfig \
-	wpad-basic-openssl
+	wpad-openssl
  PRIORITY := 1
 endef

--- a/target/linux/tegra/image/Makefile
+++ b/target/linux/tegra/image/Makefile
@@ -45,7 +45,7 @@ define Device/compulab_trimslice
  DEVICE_MODEL := TrimSlice
  DEVICE_DTS := tegra20-trimslice
  DEVICE_PACKAGES := kmod-leds-gpio kmod-r8169 kmod-rt2800-usb \
-	kmod-rtc-em3027 kmod-usb-hid kmod-usb-storage wpad-basic-openssl
+	kmod-rtc-em3027 kmod-usb-hid kmod-usb-storage wpad-openssl
  UBOOT := trimslice-mmc
 endef
 TARGET_DEVICES += compulab_trimslice
--- a/target/linux/uml/Makefile
+++ b/target/linux/uml/Makefile
@@ -18,7 +18,7 @@ KERNEL_PATCHVER:=6.6

 include $(INCLUDE_DIR)/target.mk

-DEFAULT_PACKAGES += wpad-basic-openssl kmod-mac80211-hwsim mkf2fs e2fsprogs
+DEFAULT_PACKAGES += wpad-openssl kmod-mac80211-hwsim mkf2fs e2fsprogs

  endif
 endif