From f197a2a4c92499f13697f6c40136bad08b7b157c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Mon, 22 May 2017 12:50:53 +0200 Subject: [PATCH] bcm53xx: include wpad-mini only on devices with (supported) wireless MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Don't include wpad-mini when it's useless just like we don't include useless wireless drivers. Signed-off-by: Rafał Miłecki --- target/linux/bcm53xx/Makefile | 2 +- target/linux/bcm53xx/image/Makefile | 26 ++++++++++++++------------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/target/linux/bcm53xx/Makefile b/target/linux/bcm53xx/Makefile index a98fd3923d..06077f33f4 100644 --- a/target/linux/bcm53xx/Makefile +++ b/target/linux/bcm53xx/Makefile @@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/target.mk KERNELNAME:=zImage dtbs -DEFAULT_PACKAGES += swconfig wpad-mini nvram \ +DEFAULT_PACKAGES += swconfig nvram \ osafeloader oseama otrx \ kmod-gpio-button-hotplug \ kmod-leds-gpio kmod-ledtrig-default-on kmod-ledtrig-timer diff --git a/target/linux/bcm53xx/image/Makefile b/target/linux/bcm53xx/image/Makefile index 353eede33b..ae5be34970 100644 --- a/target/linux/bcm53xx/image/Makefile +++ b/target/linux/bcm53xx/image/Makefile @@ -86,9 +86,11 @@ endef DEVICE_VARS += PRODUCTID SIGNATURE NETGEAR_BOARD_ID NETGEAR_REGION TPLINK_BOARD -BRCMFMAC_43602A1 := kmod-brcmfmac brcmfmac-firmware-43602a1-pcie -BRCMFMAC_4366B1 := kmod-brcmfmac brcmfmac-firmware-4366b1-pcie -BRCMFMAC_4366C0 := kmod-brcmfmac +IEEE8021X := wpad-mini +B43 := $(IEEE8021X) kmod-b43 +BRCMFMAC_43602A1 := $(IEEE8021X) kmod-brcmfmac brcmfmac-firmware-43602a1-pcie +BRCMFMAC_4366B1 := $(IEEE8021X) kmod-brcmfmac brcmfmac-firmware-4366b1-pcie +BRCMFMAC_4366C0 := $(IEEE8021X) kmod-brcmfmac USB2_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-phy-bcm-ns-usb2 USB2_PACKAGES += kmod-usb-ledtrig-usbport USB3_PACKAGES := $(USB2_PACKAGES) kmod-usb3 kmod-phy-bcm-ns-usb3 @@ -115,7 +117,7 @@ endef define Device/asus-rt-ac56u DEVICE_TITLE := Asus RT-AC56U - DEVICE_PACKAGES := kmod-b43 $(USB3_PACKAGES) + DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES) endef TARGET_DEVICES += asus-rt-ac56u @@ -145,19 +147,19 @@ TARGET_DEVICES += buffalo-wxr-1900dhp define Device/buffalo-wzr-600dhp2 DEVICE_TITLE := Buffalo WZR-600DHP2 - DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43) $(USB2_PACKAGES) endef TARGET_DEVICES += buffalo-wzr-600dhp2 define Device/buffalo-wzr-900dhp DEVICE_TITLE := Buffalo WZR-900DHP - DEVICE_PACKAGES := kmod-b43 $(USB3_PACKAGES) + DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES) endef TARGET_DEVICES += buffalo-wzr-900dhp define Device/buffalo-wzr-1750dhp DEVICE_TITLE := Buffalo WZR-1750DHP - DEVICE_PACKAGES := kmod-b43 $(USB3_PACKAGES) + DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES) endef TARGET_DEVICES += buffalo-wzr-1750dhp @@ -178,7 +180,7 @@ TARGET_DEVICES += dlink-dir-885l define Device/linksys-ea6300-v1 DEVICE_TITLE := Linksys EA6300 V1 - DEVICE_PACKAGES := kmod-b43 $(USB3_PACKAGES) + DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES) endef # TARGET_DEVICES += linksys-ea6300-v1 @@ -203,7 +205,7 @@ endef define Device/netgear-r6250 DEVICE_TITLE := Netgear R6250 - DEVICE_PACKAGES := kmod-b43 $(USB3_PACKAGES) + DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES) $(Device/netgear) NETGEAR_BOARD_ID := U12H245T00_NETGEAR endef @@ -211,7 +213,7 @@ TARGET_DEVICES += netgear-r6250 define Device/netgear-r6300-v2 DEVICE_TITLE := Netgear R6300 V2 - DEVICE_PACKAGES := kmod-b43 $(USB3_PACKAGES) + DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES) $(Device/netgear) NETGEAR_BOARD_ID := U12H240T00_NETGEAR endef @@ -259,7 +261,7 @@ TARGET_DEVICES += smartrg-sr400ac define Device/tenda-ac9 DEVICE_TITLE := Tenda AC9 - DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43) $(USB2_PACKAGES) IMAGES := trx IMAGE/trx := append-rootfs | trx-serial endef @@ -267,7 +269,7 @@ TARGET_DEVICES += tenda-ac9 define Device/tplink-archer-c5-v2 DEVICE_TITLE := TP-LINK Archer C5 V2 - DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43) $(USB2_PACKAGES) IMAGES := bin IMAGE/bin := append-rootfs | bcm53xx-tplink-safeloader TPLINK_BOARD := ARCHER-C5-V2 -- 2.25.1