brcm47xx: remove versions from linksys-e1000 target

[openwrt/openwrt.git] / target / linux / brcm47xx / image / Makefile

diff --git a/target/linux/brcm47xx/image/Makefile b/target/linux/brcm47xx/image/Makefile
index 2c79ab0b1abda5cf6cb69f8853a53fd147e4f08b..284e1f7c05745b8a1162cdc0c420f9030acb86cc 100644 (file)
--- a/target/linux/brcm47xx/image/Makefile
+++ b/target/linux/brcm47xx/image/Makefile
@@ -7,6 +7,9 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
+USB1_PACKAGES := kmod-usb-ohci
+USB2_PACKAGES := $(USB1_PACKAGES) kmod-usb2
+
 define Build/Clean
        $(MAKE) -C lzma-loader clean
 endef
@@ -41,7 +44,7 @@ define trxalign/jffs2-64k
 -a 0x10000 -f $(KDIR)/root.$(1)
 endef
 define trxalign/squashfs
--a 1024 -f $(KDIR)/root.$(1) $(if $(2),-f $(2)) -a 0x10000 -A $(KDIR)/fs_mark
+-a 1024 -f $(1) $(if $(2),-f $(2)) -a 0x10000 -A $(KDIR)/fs_mark
 endef
 
 #################################################
@@ -54,7 +57,7 @@ define Build/trx-with-loader
                -o $@.new \
                -f $(KDIR)/loader.gz \
                -f $(IMAGE_KERNEL) \
-               $(call trxalign/$(FILESYSTEM),$(FILESYSTEM))
+               $(call trxalign/$(FILESYSTEM),$@)
        mv $@.new $@
 endef
 
@@ -65,7 +68,7 @@ define Build/trx-v2-with-loader
                -o $@.new \
                -f $(KDIR)/loader.gz \
                -f $(KDIR)/vmlinux.lzma \
-               $(call trxalign/$(FILESYSTEM),$(FILESYSTEM),$@.pattern)
+               $(call trxalign/$(FILESYSTEM),$@,$@.pattern)
        mv $@.new $@
 endef
 
@@ -74,7 +77,7 @@ define Build/trx-without-loader
                -m 33554432 \
                -o $@.new \
                -f $(IMAGE_KERNEL) \
-               $(call trxalign/$(FILESYSTEM),$(FILESYSTEM))
+               $(call trxalign/$(FILESYSTEM),$@)
        mv $@.new $@
 endef
 
@@ -138,9 +141,10 @@ define Device/Default
        KERNEL := kernel-bin
        IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1).$$(2)
        KERNEL_NAME = vmlinux.lzma
+       KERNEL_INITRAMFS_NAME = vmlinux-initramfs.lzma
        FILESYSTEMS := $(FS_64K)
        IMAGES := trx
-       IMAGE/trx := trx-with-loader
+       IMAGE/trx := append-rootfs | trx-with-loader
 endef
 
 define Device/standard
@@ -150,33 +154,33 @@ endef
 define Device/standard-noloader-gz
   DEVICE_TITLE := Image with gzipped kernel
   KERNEL_NAME = vmlinux.gz
-  IMAGE/trx := trx-without-loader
+  IMAGE/trx := append-rootfs | trx-without-loader
 endef
 
 define Device/standard-noloader-nodictionarylzma
   DEVICE_TITLE := Image with LZMA compressed kernel matching CFE decompressor
   KERNEL_NAME = vmlinux-nodictionary.lzma
-  IMAGE/trx := trx-without-loader
+  IMAGE/trx := append-rootfs | trx-without-loader
 endef
 
 define Device/asus
        IMAGES := trx
-       IMAGE/trx := trx-with-loader | asus-trx
+       IMAGE/trx := append-rootfs | trx-with-loader | asus-trx
 endef
 
 define Device/linksys
        IMAGES := bin
-       IMAGE/bin := trx-with-loader | linksys-bin
+       IMAGE/bin := append-rootfs | trx-with-loader | linksys-bin
 endef
 
 define Device/motorola
        IMAGES := bin
-       IMAGE/bin := trx-with-loader | motorola-bin
+       IMAGE/bin := append-rootfs | trx-with-loader | motorola-bin
 endef
 
 define Device/netgear
        IMAGES := chk
-       IMAGE/chk := trx-with-loader | netgear-chk
+       IMAGE/chk := append-rootfs | trx-with-loader | netgear-chk
 endef
 
 #################################################
@@ -187,6 +191,7 @@ ifeq ($(SUBTARGET),generic)
   # BCM4705 with tg3
 define Device/linksys-wrt300n-v1.1
   DEVICE_TITLE := Linksys WRT300N v1.1
+  DEVICE_PACKAGES := kmod-tg3 kmod-b43
   $(Device/linksys)
   DEVICE_ID := EWC2
   VERSION := 1.51.2
@@ -195,6 +200,7 @@ TARGET_DEVICES += linksys-wrt300n-v1.1
 
 define Device/linksys-wrt310n-v1
   DEVICE_TITLE := Linksys WRT310N v1
+  DEVICE_PACKAGES := kmod-tg3 kmod-b43
   $(Device/linksys)
   DEVICE_ID := 310N
   VERSION := 1.0.10
@@ -203,6 +209,7 @@ TARGET_DEVICES += linksys-wrt310n-v1
 
 define Device/linksys-wrt350n-v1
   DEVICE_TITLE := Linksys WRT350N v1
+  DEVICE_PACKAGES := kmod-tg3 kmod-b43 $(USB2_PACKAGES)
   $(Device/linksys)
   DEVICE_ID := EWCG
   VERSION := 1.04.1
@@ -211,6 +218,7 @@ TARGET_DEVICES += linksys-wrt350n-v1
 
 define Device/linksys-wrt610n-v1
   DEVICE_TITLE := Linksys WRT610N v1
+  DEVICE_PACKAGES := kmod-tg3 kmod-b43 $(USB2_PACKAGES)
   $(Device/linksys)
   DEVICE_ID := 610N
   VERSION := 1.0.1
@@ -220,6 +228,7 @@ TARGET_DEVICES += linksys-wrt610n-v1
   # BCMA SoC with SSB WiFi
 define Device/linksys-wrt610n-v2
   DEVICE_TITLE := Linksys WRT610N v2
+  DEVICE_PACKAGES := kmod-bgmac kmod-b43 $(USB2_PACKAGES)
   $(Device/linksys)
   DEVICE_ID := 610N
   VERSION := 2.0.0
@@ -228,12 +237,18 @@ TARGET_DEVICES += linksys-wrt610n-v2
 
 define Device/linksys-e3000-v1
   DEVICE_TITLE := Linksys E3000 v1
+  DEVICE_PACKAGES := kmod-bgmac kmod-b43 $(USB2_PACKAGES)
   $(Device/linksys)
   DEVICE_ID := 61XN
   VERSION := 1.0.3
 endef
 TARGET_DEVICES += linksys-e3000-v1
 
+# generic has Ethernet drivers as modules so overwrite standard image
+define Device/standard
+  DEVICE_TITLE := Image with LZMA loader and LZMA compressed kernel
+  DEVICE_PACKAGES := kmod-b44 kmod-bgmac kmod-tg3
+endef
 TARGET_DEVICES += standard
 endif
 
@@ -245,6 +260,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
@@ -252,6 +268,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
@@ -259,6 +276,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
@@ -266,6 +284,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
@@ -273,6 +292,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
@@ -280,6 +300,7 @@ TARGET_DEVICES += asus-wl-500gp-v2
 
 define Device/asus-wl-500w
   DEVICE_TITLE := Asus WL-500W
+  DEVICE_PACKAGES := kmod-b43 kmod-usb-uhci kmod-usb2-pci
   $(Device/asus)
   PRODUCTID := "WL500W      "
 endef
@@ -287,6 +308,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
@@ -294,6 +316,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
@@ -301,6 +324,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
@@ -309,28 +333,31 @@ TARGET_DEVICES += asus-wl-hdd25
 define Device/dlink-dwl-3150
   DEVICE_TITLE := D-Link DWL-3150
   IMAGES := bin
-  IMAGE/bin := trx-with-loader | tailed-bin
+  IMAGE/bin := append-rootfs | trx-with-loader | tailed-bin
   BIN_TAIL := BCM-5352-2050-0000000-01
 endef
 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 := trx-with-loader | edimax-bin
+  IMAGE/bin := append-rootfs | trx-with-loader | edimax-bin
 endef
 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 := trx-without-loader | huawei-bin
+  IMAGE/bin := append-rootfs | trx-without-loader | huawei-bin
 endef
 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
@@ -347,10 +374,11 @@ 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 | trx-v2-with-loader
-  IMAGE/bin := linksys-pattern-partition | trx-v2-with-loader | linksys-bin
+  IMAGE/noheader.bin := linksys-pattern-partition | append-rootfs | trx-v2-with-loader
+  IMAGE/bin := linksys-pattern-partition | append-rootfs | trx-v2-with-loader | linksys-bin
   DEVICE_ID := 3G2V
   VERSION := 3.00.24
   SERIAL := 6
@@ -359,6 +387,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
@@ -367,6 +396,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
@@ -376,6 +406,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
@@ -384,6 +415,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
@@ -393,6 +425,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
@@ -401,6 +434,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
@@ -409,6 +443,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
@@ -418,6 +453,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
@@ -425,6 +461,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
@@ -432,6 +469,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
@@ -439,6 +477,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
@@ -447,14 +486,16 @@ TARGET_DEVICES += netgear-wgr614-v8
 
 define Device/netgear-wgt634u
   DEVICE_TITLE := Netgear WGT634U
+  DEVICE_PACKAGES := kmod-ath5k $(USB2_PACKAGES)
   FILESYSTEMS := $(FS_128K)
   IMAGES := bin
-  IMAGE/bin := trx-with-loader | prepend-with-elf
+  IMAGE/bin := append-rootfs | trx-with-loader | prepend-with-elf
 endef
 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
@@ -463,6 +504,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
@@ -471,8 +513,9 @@ TARGET_DEVICES += netgear-wnr834b-v2
 
 define Device/usrobotics-usr5461
   DEVICE_TITLE := USRobotics USR5461
+  DEVICE_PACKAGES := kmod-b43 $(USB1_PACKAGES)
   IMAGES := bin
-  IMAGE/bin := trx-with-loader | usrobotics-bin
+  IMAGE/bin := append-rootfs | trx-with-loader | usrobotics-bin
 endef
 TARGET_DEVICES += usrobotics-usr5461
 
@@ -486,6 +529,7 @@ endif
 ifeq ($(SUBTARGET),mips74k)
 define Device/asus-rt-ac53u
   DEVICE_TITLE := Asus RT-AC53U
+  DEVICE_PACKAGES := $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := RT-AC53U
 endef
@@ -493,6 +537,7 @@ TARGET_DEVICES += asus-rt-ac53u
 
 define Device/asus-rt-ac66u
   DEVICE_TITLE := Asus RT-AC66U
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := RT-AC66U
 endef
@@ -500,6 +545,7 @@ endef
 
 define Device/asus-rt-n10
   DEVICE_TITLE := Asus RT-N10
+  DEVICE_PACKAGES := kmod-b43
   $(Device/asus)
   PRODUCTID := "RT-N10      "
 endef
@@ -507,6 +553,7 @@ TARGET_DEVICES += asus-rt-n10
 
 define Device/asus-rt-n10p
   DEVICE_TITLE := Asus RT-N10P
+  DEVICE_PACKAGES := kmod-b43
   $(Device/asus)
   PRODUCTID := RT-N10P
 endef
@@ -521,6 +568,7 @@ TARGET_DEVICES += asus-rt-n10p-v2
 
 define Device/asus-rt-n10u
   DEVICE_TITLE := Asus RT-N10U
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := RT-N10U
 endef
@@ -528,6 +576,7 @@ TARGET_DEVICES += asus-rt-n10u
 
 define Device/asus-rt-n10u-b
   DEVICE_TITLE := Asus RT-N10U B
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := RT-N10U
 endef
@@ -535,6 +584,7 @@ TARGET_DEVICES += asus-rt-n10u-b
 
 define Device/asus-rt-n12
   DEVICE_TITLE := Asus RT-N12
+  DEVICE_PACKAGES := kmod-b43
   $(Device/asus)
   PRODUCTID := "RT-N12      "
 endef
@@ -570,6 +620,7 @@ TARGET_DEVICES += asus-rt-n12hp
 
 define Device/asus-rt-n14uhp
   DEVICE_TITLE := Asus RT-N14UHP
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := RT-N14UHP
 endef
@@ -577,6 +628,7 @@ TARGET_DEVICES += asus-rt-n14uhp
 
 define Device/asus-rt-n15u
   DEVICE_TITLE := Asus RT-N15U
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := RT-N15U
 endef
@@ -584,6 +636,7 @@ TARGET_DEVICES += asus-rt-n15u
 
 define Device/asus-rt-n16
   DEVICE_TITLE := Asus RT-N16
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := RT-N16
 endef
@@ -591,6 +644,7 @@ TARGET_DEVICES += asus-rt-n16
 
 define Device/asus-rt-n53
   DEVICE_TITLE := Asus RT-N53
+  DEVICE_PACKAGES := kmod-b43
   $(Device/asus)
   PRODUCTID := RT-N53
 endef
@@ -598,6 +652,7 @@ TARGET_DEVICES += asus-rt-n53
 
 define Device/asus-rt-n66u
   DEVICE_TITLE := Asus RT-N66U
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := RT-N66U
 endef
@@ -605,6 +660,7 @@ TARGET_DEVICES += asus-rt-n66u
 
 define Device/asus-rt-n66w
   DEVICE_TITLE := Asus RT-N66W
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/asus)
   PRODUCTID := RT-N66U
 endef
@@ -612,6 +668,7 @@ TARGET_DEVICES += asus-rt-n66w
 
 define Device/linksys-wrt160n-v3
   DEVICE_TITLE := Linksys WRT160N v3
+  DEVICE_PACKAGES := kmod-b43
   $(Device/linksys)
   DEVICE_ID := N150
   VERSION := 3.0.3
@@ -620,6 +677,7 @@ TARGET_DEVICES += linksys-wrt160n-v3
 
 define Device/linksys-wrt310n-v2
   DEVICE_TITLE := Linksys WRT310N v2
+  DEVICE_PACKAGES := kmod-b43
   $(Device/linksys)
   DEVICE_ID := 310N
   VERSION := 2.0.1
@@ -628,6 +686,7 @@ TARGET_DEVICES += linksys-wrt310n-v2
 
 define Device/linksys-wrt320n-v1
   DEVICE_TITLE := Linksys WRT320N v1
+  DEVICE_PACKAGES := kmod-b43
   $(Device/linksys)
   DEVICE_ID := 320N
   VERSION := 1.0.5
@@ -642,13 +701,14 @@ define Device/linksys-e900-v1
 endef
 TARGET_DEVICES += linksys-e900-v1
 
-define Device/linksys-e1000-v1-v2-v2.1
+define Device/linksys-e1000
   DEVICE_TITLE := Linksys E1000 v1 v2 v2.1
+  DEVICE_PACKAGES := kmod-b43
   $(Device/linksys)
   DEVICE_ID := E100
   VERSION := 1.1.3
 endef
-TARGET_DEVICES += linksys-e1000-v1-v2-v2.1
+TARGET_DEVICES += linksys-e1000
 
 define Device/linksys-e1200-v1
   DEVICE_TITLE := Linksys E1200 v1
@@ -676,6 +736,7 @@ TARGET_DEVICES += linksys-e1500-v1
 
 define Device/linksys-e1550-v1
   DEVICE_TITLE := Linksys E1550 v1
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/linksys)
   DEVICE_ID := 1550
   VERSION := 1.0.3
@@ -684,6 +745,7 @@ TARGET_DEVICES += linksys-e1550-v1
 
 define Device/linksys-e2000-v1
   DEVICE_TITLE := Linksys E2000 v1
+  DEVICE_PACKAGES := kmod-b43
   $(Device/linksys)
   DEVICE_ID := 32XN
   VERSION := 1.0.4
@@ -692,6 +754,7 @@ TARGET_DEVICES += linksys-e2000-v1
 
 define Device/linksys-e2500-v1
   DEVICE_TITLE := Linksys E2500 v1
+  DEVICE_PACKAGES := kmod-b43
   $(Device/linksys)
   DEVICE_ID := E25X
   VERSION := 1.0.7
@@ -700,6 +763,7 @@ TARGET_DEVICES += linksys-e2500-v1
 
 define Device/linksys-e2500-v2
   DEVICE_TITLE := Linksys E2500 v2
+  DEVICE_PACKAGES := kmod-b43
   $(Device/linksys)
   DEVICE_ID := E25X
   VERSION := 2.0.0
@@ -708,6 +772,7 @@ TARGET_DEVICES += linksys-e2500-v2
 
 define Device/linksys-e2500-v2.1
   DEVICE_TITLE := Linksys E2500 v2.1
+  DEVICE_PACKAGES := kmod-b43
   $(Device/linksys)
   DEVICE_ID := 25RU
   VERSION := 2.1.0
@@ -716,6 +781,7 @@ TARGET_DEVICES += linksys-e2500-v2.1
 
 define Device/linksys-e2500-v3
   DEVICE_TITLE := Linksys E2500 v3
+  DEVICE_PACKAGES := kmod-b43
   $(Device/linksys)
   DEVICE_ID := 25V3
   VERSION := 3.0.0
@@ -724,6 +790,7 @@ TARGET_DEVICES += linksys-e2500-v3
 
 define Device/linksys-e3200-v1
   DEVICE_TITLE := Linksys E3200 v1
+  DEVICE_PACKAGES := kmod-b43
   $(Device/linksys)
   DEVICE_ID := 3200
   VERSION := 1.0.1
@@ -732,38 +799,49 @@ TARGET_DEVICES += linksys-e3200-v1
 
 define Device/linksys-e4200-v1
   DEVICE_TITLE := Linksys E4200 v1
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/linksys)
   DEVICE_ID := 4200
   VERSION := 1.0.5
 endef
 TARGET_DEVICES += linksys-e4200-v1
 
-define Device/netgear-wgr614-v10_north-america
+define Device/netgear-wgr614-v10-na
   DEVICE_TITLE := Netgear WGR614 v10 North America
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H139T01_NETGEAR
   NETGEAR_REGION := 2
 endef
-TARGET_DEVICES += netgear-wgr614-v10_north-america
+TARGET_DEVICES += netgear-wgr614-v10-na
 
-define Device/netgear-wgr614-v10_other-regions
-  DEVICE_TITLE := Netgear WGR614 v10 Other Regions
+define Device/netgear-wgr614-v10
+  DEVICE_TITLE := Netgear WGR614 v10
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H139T01_NETGEAR
   NETGEAR_REGION := 1
 endef
-TARGET_DEVICES += netgear-wgr614-v10_other-regions
+TARGET_DEVICES += netgear-wgr614-v10
 
 define Device/netgear-wn2500rp-v1
   DEVICE_TITLE := Netgear WN2500RP v1
+  DEVICE_PACKAGES := kmod-b43
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H197T00_NETGEAR
   NETGEAR_REGION := 1
 endef
 TARGET_DEVICES += netgear-wn2500rp-v1
 
+define Device/netgear-wn3000rp
+  DEVICE_TITLE := Netgear WN3000RP
+  $(Device/netgear)
+  NETGEAR_BOARD_ID := U12H163T01_NETGEAR
+  NETGEAR_REGION := 1
+endef
+TARGET_DEVICES += netgear-wn3000rp
+
 define Device/netgear-wndr3400-v1
   DEVICE_TITLE := Netgear WNDR3400 v1
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H155T00_NETGEAR
   NETGEAR_REGION := 2
@@ -772,6 +850,7 @@ TARGET_DEVICES += netgear-wndr3400-v1
 
 define Device/netgear-wndr3400-v2
   DEVICE_TITLE := Netgear WNDR3400 v2
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H187T00_NETGEAR
   NETGEAR_REGION := 2
@@ -780,6 +859,7 @@ TARGET_DEVICES += netgear-wndr3400-v2
 
 define Device/netgear-wndr3400-v3
   DEVICE_TITLE := Netgear WNDR3400 v3
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H208T00_NETGEAR
   NETGEAR_REGION := 1
@@ -788,6 +868,7 @@ TARGET_DEVICES += netgear-wndr3400-v3
 
 define Device/netgear-wndr3700-v3
   DEVICE_TITLE := Netgear WNDR3700 v3
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H194T00_NETGEAR
   NETGEAR_REGION := 2
@@ -796,6 +877,7 @@ TARGET_DEVICES += netgear-wndr3700-v3
 
 define Device/netgear-wndr3400-vcna
   DEVICE_TITLE := Netgear WNDR3400 vcna
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H155T01_NETGEAR
   NETGEAR_REGION := 2
@@ -804,6 +886,7 @@ endef
 
 define Device/netgear-wndr4000
   DEVICE_TITLE := Netgear WNDR4000
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H181T00_NETGEAR
   NETGEAR_REGION := 2
@@ -820,38 +903,34 @@ TARGET_DEVICES += netgear-wnr1000-v3
 
 define Device/netgear-wnr2000v2
   DEVICE_TITLE := Netgear WNR2000 v2
+  DEVICE_PACKAGES := kmod-b43
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H114T00_NETGEAR
   NETGEAR_REGION := 2
 endef
 TARGET_DEVICES += netgear-wnr2000v2
 
-define Device/netgear-wnr3000rp
-  DEVICE_TITLE := Netgear WNR3000RP
-  $(Device/netgear)
-  NETGEAR_BOARD_ID := U12H163T01_NETGEAR
-  NETGEAR_REGION := 1
-endef
-TARGET_DEVICES += netgear-wnr3000rp
-
-define Device/netgear-wnr3500l-v1-north-america
+define Device/netgear-wnr3500l-v1-na
   DEVICE_TITLE := Netgear WNR3500L v1 North America
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H136T99_NETGEAR
   NETGEAR_REGION := 2
 endef
-TARGET_DEVICES += netgear-wnr3500l-v1-north-america
+TARGET_DEVICES += netgear-wnr3500l-v1-na
 
-define Device/netgear-wnr3500l-v1-other-regions
+define Device/netgear-wnr3500l-v1
   DEVICE_TITLE := Netgear WNR3500L v1 Other Regions
+  DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES)
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H136T99_NETGEAR
   NETGEAR_REGION := 1
 endef
-TARGET_DEVICES += netgear-wnr3500l-v1-other-regions
+TARGET_DEVICES += netgear-wnr3500l-v1
 
 define Device/netgear-wnr3500l-v2
   DEVICE_TITLE := Netgear WNR3500L v2
+  DEVICE_PACKAGES := $(USB2_PACKAGES)
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H172T00_NETGEAR
   NETGEAR_REGION := 1
@@ -860,6 +939,7 @@ TARGET_DEVICES += netgear-wnr3500l-v2
 
 define Device/netgear-wnr3500u
   DEVICE_TITLE := Netgear WNR3500U
+  DEVICE_PACKAGES := $(USB2_PACKAGES)
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H136T00_NETGEAR
   NETGEAR_REGION := 2
@@ -868,6 +948,7 @@ endef
 
 define Device/netgear-wnr3500-v2
   DEVICE_TITLE := Netgear WNR3500 v2
+  DEVICE_PACKAGES := kmod-b43
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H127T00_NETGEAR
   NETGEAR_REGION := 2
@@ -876,6 +957,7 @@ TARGET_DEVICES += netgear-wnr3500-v2
 
 define Device/netgear-wnr3500-v2-vc
   DEVICE_TITLE := Netgear WNR3500 v2 vc
+  DEVICE_PACKAGES := kmod-b43
   $(Device/netgear)
   NETGEAR_BOARD_ID := U12H127T70_NETGEAR
   NETGEAR_REGION := 2