X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbcm53xx%2Fimage%2FMakefile;h=504ecff138e03cf324afde5761b3260f3c371aed;hb=ea7462ae074be6ab6e014eece1b6bd373d3dd318;hp=2f45a7b440597b7c478d1dba569ad6fcc1ec8c00;hpb=e7ec7a08aae0afb1064d1bf26a9cd6fe1e64d516;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/bcm53xx/image/Makefile b/target/linux/bcm53xx/image/Makefile
index 2f45a7b440..504ecff138 100644
--- a/target/linux/bcm53xx/image/Makefile
+++ b/target/linux/bcm53xx/image/Makefile
@@ -70,8 +70,11 @@ endef
 
 DEVICE_VARS += PRODUCTID SIGNATURE NETGEAR_BOARD_ID NETGEAR_REGION
 
-USB2_PACKAGES := kmod-usb-ohci kmod-usb2
-USB3_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb3
+BRCMFMAC_43602A1 := kmod-brcmfmac brcmfmac-firmware-43602a1-pcie
+BRCMFMAC_4366B1 := kmod-brcmfmac brcmfmac-firmware-4366b1-pcie
+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
 
 define Device/Default
   # .dtb files are prefixed by SoC type, e.g. bcm4708- which is not included in device/image names
@@ -85,7 +88,6 @@ define Device/Default
   IMAGES := trx
   BLOCKSIZE := 128k
   PAGESIZE := 2048
-  UBINIZE_OPTS :=
   IMAGE/trx := append-ubi | trx-nand
 endef
 
@@ -149,7 +151,7 @@ endef
 
 define Device/dlink-dir-885l
   DEVICE_TITLE := D-Link DIR-885L
-  DEVICE_PACKAGES := kmod-brcmfmac $(USB3_PACKAGES)
+  DEVICE_PACKAGES := $(BRCMFMAC_4366B1) $(USB3_PACKAGES)
   $(Device/dlink)
   SIGNATURE := wrgac42_dlink.2015_dir885l
 endef
@@ -191,7 +193,7 @@ TARGET_DEVICES += netgear-r7000
 
 define Device/netgear-r7900
   DEVICE_TITLE := Netgear R7900
-  DEVICE_PACKAGES := kmod-brcmfmac $(USB3_PACKAGES)
+  DEVICE_PACKAGES := $(BRCMFMAC_43602A1) $(USB3_PACKAGES)
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H315T30_NETGEAR
 endef
@@ -199,14 +201,14 @@ TARGET_DEVICES += netgear-r7900
 
 define Device/netgear-r8000
   DEVICE_TITLE := Netgear R8000
-  DEVICE_PACKAGES := kmod-brcmfmac $(USB3_PACKAGES)
+  DEVICE_PACKAGES := $(BRCMFMAC_43602A1) $(USB3_PACKAGES)
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H315T00_NETGEAR
 endef
 
 define Device/netgear-r8500
   DEVICE_TITLE := Netgear R8500
-  DEVICE_PACKAGES := kmod-brcmfmac $(USB3_PACKAGES)
+  DEVICE_PACKAGES := $(BRCMFMAC_4366B1) $(USB3_PACKAGES)
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H334T00_NETGEAR
 endef
@@ -214,7 +216,7 @@ endef
 
 define Device/smartrg-sr400ac
   DEVICE_TITLE := SmartRG SR400ac
-  DEVICE_PACKAGES := kmod-brcmfmac $(USB3_PACKAGES)
+  DEVICE_PACKAGES := $(BRCMFMAC_43602A1) $(USB3_PACKAGES)
   IMAGES := trx
   IMAGE/trx := append-rootfs | trx-serial
 endef