From: Rafał Miłecki <rafal@milecki.pl>
Date: Thu, 29 Dec 2016 07:06:16 +0000 (+0100)
Subject: brcm47xx: legacy: specify DEVICE_PACKAGES for all devices
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1d74f788777ba4c52300e64bd4cc0c4a2f09b3e8;p=openwrt%2Fstaging%2Fblocktrron.git

brcm47xx: legacy: specify DEVICE_PACKAGES for all devices

This allows more feature complete images. Of course it affect the size,
e.g. enabling b43 bumped rootfs from 1569618 to 2029122 for me.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

diff --git a/target/linux/brcm47xx/image/Makefile b/target/linux/brcm47xx/image/Makefile
index 04077e8002..5d5fbbcd03 100644
--- a/target/linux/brcm47xx/image/Makefile
+++ b/target/linux/brcm47xx/image/Makefile
@@ -7,7 +7,8 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-USB2_PACKAGES := kmod-usb2
+USB1_PACKAGES := kmod-usb-ohci
+USB2_PACKAGES := $(USB1_PACKAGES) kmod-usb2
 
 define Build/Clean
 	$(MAKE) -C lzma-loader clean
@@ -248,6 +249,7 @@ ifeq ($(SUBTARGET),legacy)
 
 define Device/asus-wl-300g
   DEVICE_TITLE := Asus WL-300g
+  DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
   $(Device/asus)
   PRODUCTID := "WL300g      "
 endef
@@ -255,6 +257,7 @@ TARGET_DEVICES += asus-wl-300g
 
 define Device/asus-wl-320gp
   DEVICE_TITLE := Asus WL-320gP
+  DEVICE_PACKAGES := kmod-b43
   $(Device/asus)
   PRODUCTID := "WL320gP     "
 endef
@@ -262,6 +265,7 @@ TARGET_DEVICES += asus-wl-320gp
 
 define Device/asus-wl-330ge
   DEVICE_TITLE := Asus WL-330gE
+  DEVICE_PACKAGES := kmod-b43
   $(Device/asus)
   PRODUCTID := "WL-330gE    "
 endef
@@ -269,6 +273,7 @@ TARGET_DEVICES += asus-wl-330ge
 
 define Device/asus-wl-500gp-v1
   DEVICE_TITLE := Asus WL-500gP v1
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := "WL500gp     "
 endef
@@ -276,6 +281,7 @@ TARGET_DEVICES += asus-wl-500gp-v1
 
 define Device/asus-wl-500gp-v2
   DEVICE_TITLE := Asus WL-500gP v2
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := "WL500gpv2   "
 endef
@@ -283,6 +289,7 @@ TARGET_DEVICES += asus-wl-500gp-v2
 
 define Device/asus-wl-500w
   DEVICE_TITLE := Asus WL-500W
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := "WL500W      "
 endef
@@ -290,6 +297,7 @@ TARGET_DEVICES += asus-wl-500w
 
 define Device/asus-wl-520gu
   DEVICE_TITLE := Asus WL-520gU
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := "WL520gu     "
 endef
@@ -297,6 +305,7 @@ TARGET_DEVICES += asus-wl-520gu
 
 define Device/asus-wl-550ge
   DEVICE_TITLE := Asus WL-550gE
+  DEVICE_PACKAGES := kmod-b43
   $(Device/asus)
   PRODUCTID := "WL550gE     "
 endef
@@ -304,6 +313,7 @@ TARGET_DEVICES += asus-wl-550ge
 
 define Device/asus-wl-hdd25
   DEVICE_TITLE := Asus WL-HDD25
+  DEVICE_PACKAGES := kmod-b43 kmod-b43legacy $(USB1_PACKAGES)
   $(Device/asus)
   PRODUCTID := "WLHDD       "
 endef
@@ -319,6 +329,7 @@ TARGET_DEVICES += dlink-dwl-3150
 
 define Device/edimax-ps1208-mfg
   DEVICE_TITLE := Edimax PS-1208MFg
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   IMAGES := bin
   IMAGE/bin := append-rootfs | trx-with-loader | edimax-bin
 endef
@@ -326,6 +337,7 @@ TARGET_DEVICES += edimax-ps1208-mfg
 
 define Device/huawei-e970
   DEVICE_TITLE := Huawei E970
+  DEVICE_PACKAGES := kmod-b43
   KERNEL_NAME = vmlinux.gz
   IMAGES := bin
   IMAGE/bin := append-rootfs | trx-without-loader | huawei-bin
@@ -334,6 +346,7 @@ TARGET_DEVICES += huawei-e970
 
 define Device/linksys-wrt54g3g
   DEVICE_TITLE := Linksys WRT54G3G
+  DEVICE_PACKAGES := kmod-b43
   $(Device/linksys)
   DEVICE_ID := W54F
   VERSION := 2.20.1
@@ -350,6 +363,7 @@ TARGET_DEVICES += linksys-wrt54g3g-em
 
 define Device/linksys-wrt54g3gv2-vf
   DEVICE_TITLE := Linksys WRT54G3GV2-VF
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   FILESYSTEMS := $(FS_128K)
   IMAGES := noheader.bin bin
   IMAGE/noheader.bin := linksys-pattern-partition | append-rootfs | trx-v2-with-loader
@@ -362,6 +376,7 @@ TARGET_DEVICES += linksys-wrt54g3gv2-vf
 
 define Device/linksys-wrt54g
   DEVICE_TITLE := Linksys WRT54G
+  DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
   $(Device/linksys)
   DEVICE_ID := W54G
   VERSION := 4.71.1
@@ -370,6 +385,7 @@ TARGET_DEVICES += linksys-wrt54g
 
 define Device/linksys-wrt54gs
   DEVICE_TITLE := Linksys WRT54GS
+  DEVICE_PACKAGES := kmod-b43
   $(Device/linksys)
   FILESYSTEMS := $(FS_128K)
   DEVICE_ID := W54S
@@ -379,6 +395,7 @@ TARGET_DEVICES += linksys-wrt54gs
 
 define Device/linksys-wrt54gs-v4
   DEVICE_TITLE := Linksys WRT54GS v4
+  DEVICE_PACKAGES := kmod-b43
   $(Device/linksys)
   DEVICE_ID := W54s
   VERSION := 1.09.1
@@ -387,6 +404,7 @@ TARGET_DEVICES += linksys-wrt54gs-v4
 
 define Device/linksys-wrtsl54gs
   DEVICE_TITLE := Linksys WRTSL54GS
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/linksys)
   FILESYSTEMS := $(FS_128K)
   DEVICE_ID := W54U
@@ -396,6 +414,7 @@ TARGET_DEVICES += linksys-wrtsl54gs
 
 define Device/linksys-wrt150n
   DEVICE_TITLE := Linksys WRT150N
+  DEVICE_PACKAGES := kmod-b43
   $(Device/linksys)
   DEVICE_ID := N150
   VERSION := 1.51.3
@@ -404,6 +423,7 @@ TARGET_DEVICES += linksys-wrt150n
 
 define Device/linksys-wrt160n-v1
   DEVICE_TITLE := Linksys WRT160N v1
+  DEVICE_PACKAGES := kmod-b43
   $(Device/linksys)
   DEVICE_ID := N150
   VERSION := 1.50.1
@@ -412,6 +432,7 @@ TARGET_DEVICES += linksys-wrt160n-v1
 
 define Device/linksys-wrt300n-v1
   DEVICE_TITLE := Linksys WRT300N v1
+  DEVICE_PACKAGES := kmod-b43
   $(Device/linksys)
   IMAGES := bin trx
   DEVICE_ID := EWCB
@@ -421,6 +442,7 @@ TARGET_DEVICES += linksys-wrt300n-v1
 
 define Device/motorola-wa840g
   DEVICE_TITLE := Motorola WA840G
+  DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
   $(Device/motorola)
   MOTOROLA_DEVICE := 2
 endef
@@ -428,6 +450,7 @@ TARGET_DEVICES += motorola-wa840g
 
 define Device/motorola-we800g
   DEVICE_TITLE := Motorola WE800G
+  DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
   $(Device/motorola)
   MOTOROLA_DEVICE := 3
 endef
@@ -435,6 +458,7 @@ TARGET_DEVICES += motorola-we800g
 
 define Device/motorola-wr850g
   DEVICE_TITLE := Motorola WR850G
+  DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
   $(Device/motorola)
   MOTOROLA_DEVICE := 1
 endef
@@ -442,6 +466,7 @@ TARGET_DEVICES += motorola-wr850g
 
 define Device/netgear-wgr614-v8
   DEVICE_TITLE := Netgear WGR614 v8
+  DEVICE_PACKAGES := kmod-b43
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H072T00_NETGEAR
   NETGEAR_REGION := 2
@@ -459,6 +484,7 @@ TARGET_DEVICES += netgear-wgt634u
 
 define Device/netgear-wndr3300-v1
   DEVICE_TITLE := Netgear WNDR3300 v1
+  DEVICE_PACKAGES := kmod-b43
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H093T00_NETGEAR
   NETGEAR_REGION := 2
@@ -467,6 +493,7 @@ TARGET_DEVICES += netgear-wndr3300-v1
 
 define Device/netgear-wnr834b-v2
   DEVICE_TITLE := Netgear WNR834B v2
+  DEVICE_PACKAGES := kmod-b43
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H081T00_NETGEAR
   NETGEAR_REGION := 2
@@ -475,6 +502,7 @@ TARGET_DEVICES += netgear-wnr834b-v2
 
 define Device/usrobotics-usr5461
   DEVICE_TITLE := USRobotics USR5461
+  DEVICE_PACKAGES := kmod-b43 $(USB1_PACKAGES)
   IMAGES := bin
   IMAGE/bin := append-rootfs | trx-with-loader | usrobotics-bin
 endef