From 80c61c161ac5943137ade233d62cf89d746de5a2 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Tue, 10 Jul 2018 19:22:41 +0200 Subject: treewide: use wpad-basic for not small flash targets Add out of the box support for 802.11r and 802.11w to all targets not suffering from small flash. Signed-off-by: Mathias Kresin Mathias did all the heavy lifting on this, but I'm the one who should get shouted at for committing. Signed-off-by: Kevin Darbyshire-Bryant --- target/linux/brcm47xx/Makefile | 2 +- target/linux/brcm47xx/generic/profiles/101-Broadcom-wl.mk | 2 +- target/linux/brcm47xx/generic/profiles/105-Broadcom-none.mk | 2 +- target/linux/brcm47xx/generic/profiles/201-Broadcom-b44-wl.mk | 2 +- target/linux/brcm47xx/generic/profiles/205-Broadcom-b44-none.mk | 2 +- target/linux/brcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk | 2 +- target/linux/brcm47xx/generic/profiles/215-Broadcom-tg3-none.mk | 2 +- target/linux/brcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk | 2 +- target/linux/brcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk | 2 +- target/linux/brcm47xx/generic/profiles/PS-1208MFG.mk | 2 +- target/linux/brcm47xx/generic/target.mk | 2 ++ target/linux/brcm47xx/legacy/target.mk | 2 ++ target/linux/brcm47xx/mips74k/profiles/102-Broadcom-wl.mk | 2 +- target/linux/brcm47xx/mips74k/profiles/103-Broadcom-none.mk | 2 +- target/linux/brcm47xx/mips74k/target.mk | 2 ++ 15 files changed, 18 insertions(+), 12 deletions(-) (limited to 'target/linux/brcm47xx') diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile index 484f314bc1..af91d8bada 100644 --- a/target/linux/brcm47xx/Makefile +++ b/target/linux/brcm47xx/Makefile @@ -21,7 +21,7 @@ endef include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += swconfig wpad-mini nvram otrx \ +DEFAULT_PACKAGES += swconfig nvram otrx \ kmod-leds-gpio kmod-gpio-button-hotplug \ kmod-ledtrig-default-on kmod-ledtrig-timer kmod-ledtrig-netdev diff --git a/target/linux/brcm47xx/generic/profiles/101-Broadcom-wl.mk b/target/linux/brcm47xx/generic/profiles/101-Broadcom-wl.mk index 21265daff8..c3e9d20c13 100644 --- a/target/linux/brcm47xx/generic/profiles/101-Broadcom-wl.mk +++ b/target/linux/brcm47xx/generic/profiles/101-Broadcom-wl.mk @@ -7,7 +7,7 @@ define Profile/Broadcom-wl NAME:=Broadcom SoC, all Ethernet, BCM43xx WiFi (wl, proprietary) - PACKAGES:=-wpad-mini kmod-b44 kmod-tg3 kmod-bgmac kmod-brcm-wl wlc nas + PACKAGES:=-wpad-basic kmod-b44 kmod-tg3 kmod-bgmac kmod-brcm-wl wlc nas endef define Profile/Broadcom-wl/Description diff --git a/target/linux/brcm47xx/generic/profiles/105-Broadcom-none.mk b/target/linux/brcm47xx/generic/profiles/105-Broadcom-none.mk index 301d02aebb..4497124a2e 100644 --- a/target/linux/brcm47xx/generic/profiles/105-Broadcom-none.mk +++ b/target/linux/brcm47xx/generic/profiles/105-Broadcom-none.mk @@ -7,7 +7,7 @@ define Profile/Broadcom-none NAME:=Broadcom SoC, all Ethernet, No WiFi - PACKAGES:=-wpad-mini kmod-b44 kmod-tg3 kmod-bgmac + PACKAGES:=-wpad-basic kmod-b44 kmod-tg3 kmod-bgmac endef define Profile/Broadcom-none/Description diff --git a/target/linux/brcm47xx/generic/profiles/201-Broadcom-b44-wl.mk b/target/linux/brcm47xx/generic/profiles/201-Broadcom-b44-wl.mk index f974c00e45..79b7c5c000 100644 --- a/target/linux/brcm47xx/generic/profiles/201-Broadcom-b44-wl.mk +++ b/target/linux/brcm47xx/generic/profiles/201-Broadcom-b44-wl.mk @@ -7,7 +7,7 @@ define Profile/Broadcom-b44-wl NAME:=Broadcom SoC, b44 Ethernet, BCM43xx WiFi (wl, proprietary) - PACKAGES:=-wpad-mini kmod-b44 kmod-brcm-wl wlc nas + PACKAGES:=-wpad-basic kmod-b44 kmod-brcm-wl wlc nas endef define Profile/Broadcom-b44-wl/Description diff --git a/target/linux/brcm47xx/generic/profiles/205-Broadcom-b44-none.mk b/target/linux/brcm47xx/generic/profiles/205-Broadcom-b44-none.mk index a936bba203..0854b5041e 100644 --- a/target/linux/brcm47xx/generic/profiles/205-Broadcom-b44-none.mk +++ b/target/linux/brcm47xx/generic/profiles/205-Broadcom-b44-none.mk @@ -7,7 +7,7 @@ define Profile/Broadcom-b44-none NAME:=Broadcom SoC, b44 Ethernet, No WiFi - PACKAGES:=-wpad-mini kmod-b44 + PACKAGES:=-wpad-basic kmod-b44 endef define Profile/Broadcom-b44-none/Description diff --git a/target/linux/brcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk b/target/linux/brcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk index 24ac234fff..6946668c91 100644 --- a/target/linux/brcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk +++ b/target/linux/brcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk @@ -7,7 +7,7 @@ define Profile/Broadcom-tg3-wl NAME:=Broadcom SoC, tg3 Ethernet, BCM43xx WiFi (wl, proprietary) - PACKAGES:=-wpad-mini kmod-brcm-wl wlc nas kmod-tg3 + PACKAGES:=-wpad-basic kmod-brcm-wl wlc nas kmod-tg3 endef define Profile/Broadcom-tg3-wl/Description diff --git a/target/linux/brcm47xx/generic/profiles/215-Broadcom-tg3-none.mk b/target/linux/brcm47xx/generic/profiles/215-Broadcom-tg3-none.mk index 2d13ca80c4..a5a3b4a010 100644 --- a/target/linux/brcm47xx/generic/profiles/215-Broadcom-tg3-none.mk +++ b/target/linux/brcm47xx/generic/profiles/215-Broadcom-tg3-none.mk @@ -7,7 +7,7 @@ define Profile/Broadcom-tg3-none NAME:=Broadcom SoC, tg3 Ethernet, no WiFi - PACKAGES:=-wpad-mini kmod-tg3 + PACKAGES:=-wpad-basic kmod-tg3 endef define Profile/Broadcom-tg3-none/Description diff --git a/target/linux/brcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk b/target/linux/brcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk index f671cd9599..acdc20fb70 100644 --- a/target/linux/brcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk +++ b/target/linux/brcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk @@ -7,7 +7,7 @@ define Profile/Broadcom-bgmac-wl NAME:=Broadcom SoC, bgmac Ethernet, BCM43xx WiFi (wl, proprietary) - PACKAGES:=-wpad-mini kmod-bgmac kmod-brcm-wl wlc nas + PACKAGES:=-wpad-basic kmod-bgmac kmod-brcm-wl wlc nas endef define Profile/Broadcom-bgmac-wl/Description diff --git a/target/linux/brcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk b/target/linux/brcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk index 0512119304..db2d1a264c 100644 --- a/target/linux/brcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk +++ b/target/linux/brcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk @@ -7,7 +7,7 @@ define Profile/Broadcom-bgmac-none NAME:=Broadcom SoC, bgmac Ethernet, No WiFi - PACKAGES:=-wpad-mini kmod-bgmac + PACKAGES:=-wpad-basic kmod-bgmac endef define Profile/Broadcom-bgmac-none/Description diff --git a/target/linux/brcm47xx/generic/profiles/PS-1208MFG.mk b/target/linux/brcm47xx/generic/profiles/PS-1208MFG.mk index e68c9a21fc..14ee46f200 100644 --- a/target/linux/brcm47xx/generic/profiles/PS-1208MFG.mk +++ b/target/linux/brcm47xx/generic/profiles/PS-1208MFG.mk @@ -7,7 +7,7 @@ define Profile/Ps1208mfg NAME:=Edimax PS-1208MFG - PACKAGES:=-firewall -dropbear -dnsmasq -mtd -ppp -wpad-mini kmod-b44 block-mount kmod-usb-storage kmod-usb2 kmod-usb-ohci -iptables -swconfig kmod-fs-ext4 + PACKAGES:=-firewall -dropbear -dnsmasq -mtd -ppp -wpad-basic kmod-b44 block-mount kmod-usb-storage kmod-usb2 kmod-usb-ohci -iptables -swconfig kmod-fs-ext4 endef define Profile/Ps1208mfg/Description diff --git a/target/linux/brcm47xx/generic/target.mk b/target/linux/brcm47xx/generic/target.mk index 71fde52bc3..2f93778b09 100644 --- a/target/linux/brcm47xx/generic/target.mk +++ b/target/linux/brcm47xx/generic/target.mk @@ -1,6 +1,8 @@ BOARDNAME:=Generic FEATURES+=pcmcia +DEFAULT_PACKAGES += wpad-basic + define Target/Description Build generic firmware for all Broadcom BCM47xx and BCM53xx MIPS devices. It runs on both architectures BMIPS3300 and MIPS 74K. diff --git a/target/linux/brcm47xx/legacy/target.mk b/target/linux/brcm47xx/legacy/target.mk index aa0e3ed5ad..fca6128558 100644 --- a/target/linux/brcm47xx/legacy/target.mk +++ b/target/linux/brcm47xx/legacy/target.mk @@ -1,6 +1,8 @@ FEATURES += low_mem pcmcia small_flash BOARDNAME:=Legacy (BMIPS3300) +DEFAULT_PACKAGES += wpad-mini + define Target/Description Build firmware for Broadcom BCM47xx and BCM53xx devices with BMIPS3300 CPU except for BCM4705 SoC. diff --git a/target/linux/brcm47xx/mips74k/profiles/102-Broadcom-wl.mk b/target/linux/brcm47xx/mips74k/profiles/102-Broadcom-wl.mk index 502fff462d..66b13bf879 100644 --- a/target/linux/brcm47xx/mips74k/profiles/102-Broadcom-wl.mk +++ b/target/linux/brcm47xx/mips74k/profiles/102-Broadcom-wl.mk @@ -7,7 +7,7 @@ define Profile/Broadcom-mips74k-wl NAME:=Broadcom SoC, BCM43xx WiFi (proprietary wl) - PACKAGES:=-wpad-mini kmod-brcm-wl wlc nas + PACKAGES:=-wpad-basic kmod-brcm-wl wlc nas endef define Profile/Broadcom-mips74k-wl/Description diff --git a/target/linux/brcm47xx/mips74k/profiles/103-Broadcom-none.mk b/target/linux/brcm47xx/mips74k/profiles/103-Broadcom-none.mk index 5790527780..cc4668de52 100644 --- a/target/linux/brcm47xx/mips74k/profiles/103-Broadcom-none.mk +++ b/target/linux/brcm47xx/mips74k/profiles/103-Broadcom-none.mk @@ -7,7 +7,7 @@ define Profile/Broadcom-mips74k-none NAME:=Broadcom SoC, No WiFi - PACKAGES:=-wpad-mini + PACKAGES:=-wpad-basic endef define Profile/Broadcom-mips74k-none/Description diff --git a/target/linux/brcm47xx/mips74k/target.mk b/target/linux/brcm47xx/mips74k/target.mk index e5c2565258..1e2e8436d5 100644 --- a/target/linux/brcm47xx/mips74k/target.mk +++ b/target/linux/brcm47xx/mips74k/target.mk @@ -1,6 +1,8 @@ BOARDNAME:=MIPS 74K CPU_TYPE:=74kc +DEFAULT_PACKAGES += wpad-basic + define Target/Description Build firmware for Broadcom BCM47xx and BCM53xx devices with MIPS 74K CPU. -- cgit v1.2.3