Skip to content

Commit f197a2a

Browse files
author
Rafał Miłecki
committed
bcm53xx: include wpad-mini only on devices with (supported) wireless
Don't include wpad-mini when it's useless just like we don't include useless wireless drivers. Signed-off-by: Rafał Miłecki <[email protected]>
1 parent 6c03b29 commit f197a2a

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

target/linux/bcm53xx/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/target.mk
2323

2424
KERNELNAME:=zImage dtbs
2525

26-
DEFAULT_PACKAGES += swconfig wpad-mini nvram \
26+
DEFAULT_PACKAGES += swconfig nvram \
2727
osafeloader oseama otrx \
2828
kmod-gpio-button-hotplug \
2929
kmod-leds-gpio kmod-ledtrig-default-on kmod-ledtrig-timer

target/linux/bcm53xx/image/Makefile

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,11 @@ endef
8686

8787
DEVICE_VARS += PRODUCTID SIGNATURE NETGEAR_BOARD_ID NETGEAR_REGION TPLINK_BOARD
8888

89-
BRCMFMAC_43602A1 := kmod-brcmfmac brcmfmac-firmware-43602a1-pcie
90-
BRCMFMAC_4366B1 := kmod-brcmfmac brcmfmac-firmware-4366b1-pcie
91-
BRCMFMAC_4366C0 := kmod-brcmfmac
89+
IEEE8021X := wpad-mini
90+
B43 := $(IEEE8021X) kmod-b43
91+
BRCMFMAC_43602A1 := $(IEEE8021X) kmod-brcmfmac brcmfmac-firmware-43602a1-pcie
92+
BRCMFMAC_4366B1 := $(IEEE8021X) kmod-brcmfmac brcmfmac-firmware-4366b1-pcie
93+
BRCMFMAC_4366C0 := $(IEEE8021X) kmod-brcmfmac
9294
USB2_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-phy-bcm-ns-usb2
9395
USB2_PACKAGES += kmod-usb-ledtrig-usbport
9496
USB3_PACKAGES := $(USB2_PACKAGES) kmod-usb3 kmod-phy-bcm-ns-usb3
@@ -115,7 +117,7 @@ endef
115117

116118
define Device/asus-rt-ac56u
117119
DEVICE_TITLE := Asus RT-AC56U
118-
DEVICE_PACKAGES := kmod-b43 $(USB3_PACKAGES)
120+
DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES)
119121
endef
120122
TARGET_DEVICES += asus-rt-ac56u
121123

@@ -145,19 +147,19 @@ TARGET_DEVICES += buffalo-wxr-1900dhp
145147

146148
define Device/buffalo-wzr-600dhp2
147149
DEVICE_TITLE := Buffalo WZR-600DHP2
148-
DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
150+
DEVICE_PACKAGES := $(B43) $(USB2_PACKAGES)
149151
endef
150152
TARGET_DEVICES += buffalo-wzr-600dhp2
151153

152154
define Device/buffalo-wzr-900dhp
153155
DEVICE_TITLE := Buffalo WZR-900DHP
154-
DEVICE_PACKAGES := kmod-b43 $(USB3_PACKAGES)
156+
DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES)
155157
endef
156158
TARGET_DEVICES += buffalo-wzr-900dhp
157159

158160
define Device/buffalo-wzr-1750dhp
159161
DEVICE_TITLE := Buffalo WZR-1750DHP
160-
DEVICE_PACKAGES := kmod-b43 $(USB3_PACKAGES)
162+
DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES)
161163
endef
162164
TARGET_DEVICES += buffalo-wzr-1750dhp
163165

@@ -178,7 +180,7 @@ TARGET_DEVICES += dlink-dir-885l
178180

179181
define Device/linksys-ea6300-v1
180182
DEVICE_TITLE := Linksys EA6300 V1
181-
DEVICE_PACKAGES := kmod-b43 $(USB3_PACKAGES)
183+
DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES)
182184
endef
183185
# TARGET_DEVICES += linksys-ea6300-v1
184186

@@ -203,15 +205,15 @@ endef
203205

204206
define Device/netgear-r6250
205207
DEVICE_TITLE := Netgear R6250
206-
DEVICE_PACKAGES := kmod-b43 $(USB3_PACKAGES)
208+
DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES)
207209
$(Device/netgear)
208210
NETGEAR_BOARD_ID := U12H245T00_NETGEAR
209211
endef
210212
TARGET_DEVICES += netgear-r6250
211213

212214
define Device/netgear-r6300-v2
213215
DEVICE_TITLE := Netgear R6300 V2
214-
DEVICE_PACKAGES := kmod-b43 $(USB3_PACKAGES)
216+
DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES)
215217
$(Device/netgear)
216218
NETGEAR_BOARD_ID := U12H240T00_NETGEAR
217219
endef
@@ -259,15 +261,15 @@ TARGET_DEVICES += smartrg-sr400ac
259261

260262
define Device/tenda-ac9
261263
DEVICE_TITLE := Tenda AC9
262-
DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
264+
DEVICE_PACKAGES := $(B43) $(USB2_PACKAGES)
263265
IMAGES := trx
264266
IMAGE/trx := append-rootfs | trx-serial
265267
endef
266268
TARGET_DEVICES += tenda-ac9
267269

268270
define Device/tplink-archer-c5-v2
269271
DEVICE_TITLE := TP-LINK Archer C5 V2
270-
DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
272+
DEVICE_PACKAGES := $(B43) $(USB2_PACKAGES)
271273
IMAGES := bin
272274
IMAGE/bin := append-rootfs | bcm53xx-tplink-safeloader
273275
TPLINK_BOARD := ARCHER-C5-V2

0 commit comments

Comments
 (0)