summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-01-03 02:00:25 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-01-03 02:00:25 +0000
commitc12ce7de6ebbab2233dfba606f010f5170ee6505 (patch)
tree23589e6b956301de13107d2cc9be9c9dd78cdab0 /target/linux/brcm47xx
parent70fcf6903deb8a1dc39b8d9e9f37326ef9311eaf (diff)
brcm47xx: build b44 as a module
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34994 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx')
-rw-r--r--target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm1
-rw-r--r--target/linux/brcm47xx/config-3.64
-rw-r--r--target/linux/brcm47xx/profiles/100-Broadcom-b43.mk2
-rw-r--r--target/linux/brcm47xx/profiles/101-Broadcom-wl.mk2
-rw-r--r--target/linux/brcm47xx/profiles/104-Broadcom-ath5k.mk2
-rw-r--r--target/linux/brcm47xx/profiles/105-Broadcom-none.mk2
-rw-r--r--target/linux/brcm47xx/profiles/PS-1208MFG.mk2
-rw-r--r--target/linux/brcm47xx/profiles/WGT634U.mk2
-rw-r--r--target/linux/brcm47xx/profiles/WL500GPv1-ATH.mk2
-rw-r--r--target/linux/brcm47xx/profiles/WRTSL54GS.mk2
10 files changed, 9 insertions, 12 deletions
diff --git a/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm b/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm
index 3ca8456ff..d4a3b682c 100644
--- a/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm
+++ b/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm
@@ -6,6 +6,7 @@ set_preinit_iface() {
insmod diag
insmod hwmon
insmod tg3
+ insmod b44
# hardware specific overrides
case "$(cat /proc/diag/model)" in
diff --git a/target/linux/brcm47xx/config-3.6 b/target/linux/brcm47xx/config-3.6
index 421590c14..ae56ccf4d 100644
--- a/target/linux/brcm47xx/config-3.6
+++ b/target/linux/brcm47xx/config-3.6
@@ -7,10 +7,6 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
# CONFIG_ARPD is not set
-CONFIG_B44=y
-CONFIG_B44_PCI=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI_AUTOSELECT=y
CONFIG_BCM47XX=y
CONFIG_BCM47XX_BCMA=y
CONFIG_BCM47XX_SSB=y
diff --git a/target/linux/brcm47xx/profiles/100-Broadcom-b43.mk b/target/linux/brcm47xx/profiles/100-Broadcom-b43.mk
index 7880ce80f..54e3909b6 100644
--- a/target/linux/brcm47xx/profiles/100-Broadcom-b43.mk
+++ b/target/linux/brcm47xx/profiles/100-Broadcom-b43.mk
@@ -7,7 +7,7 @@
define Profile/Broadcom-b43
NAME:=Broadcom BCM43xx WiFi (b43, default)
- PACKAGES:=kmod-b43 kmod-b43legacy
+ PACKAGES:=kmod-b44 kmod-b43 kmod-b43legacy
endef
define Profile/Broadcom-b43/Description
diff --git a/target/linux/brcm47xx/profiles/101-Broadcom-wl.mk b/target/linux/brcm47xx/profiles/101-Broadcom-wl.mk
index 1464b7e15..bad38de67 100644
--- a/target/linux/brcm47xx/profiles/101-Broadcom-wl.mk
+++ b/target/linux/brcm47xx/profiles/101-Broadcom-wl.mk
@@ -7,7 +7,7 @@
define Profile/Broadcom-wl
NAME:=Broadcom BCM43xx WiFi (wl, proprietary)
- PACKAGES:=-wpad-mini kmod-brcm-wl wlc nas
+ PACKAGES:=-wpad-mini kmod-b44 kmod-brcm-wl wlc nas
endef
define Profile/Broadcom-wl/Description
diff --git a/target/linux/brcm47xx/profiles/104-Broadcom-ath5k.mk b/target/linux/brcm47xx/profiles/104-Broadcom-ath5k.mk
index 32baa089a..56a505a90 100644
--- a/target/linux/brcm47xx/profiles/104-Broadcom-ath5k.mk
+++ b/target/linux/brcm47xx/profiles/104-Broadcom-ath5k.mk
@@ -7,7 +7,7 @@
define Profile/Broadcom-ath5k
NAME:=Atheros WiFi (ath5k)
- PACKAGES:=kmod-ath5k
+ PACKAGES:=kmod-b44 kmod-ath5k
endef
define Profile/Atheros/Description
diff --git a/target/linux/brcm47xx/profiles/105-Broadcom-none.mk b/target/linux/brcm47xx/profiles/105-Broadcom-none.mk
index 04ad25dc6..d04813692 100644
--- a/target/linux/brcm47xx/profiles/105-Broadcom-none.mk
+++ b/target/linux/brcm47xx/profiles/105-Broadcom-none.mk
@@ -7,7 +7,7 @@
define Profile/Broadcom-none
NAME:=No WiFi
- PACKAGES:=-wpad-mini
+ PACKAGES:=-wpad-mini kmod-b44
endef
define Profile/None/Description
diff --git a/target/linux/brcm47xx/profiles/PS-1208MFG.mk b/target/linux/brcm47xx/profiles/PS-1208MFG.mk
index 5d7388ba1..8d8aa687b 100644
--- a/target/linux/brcm47xx/profiles/PS-1208MFG.mk
+++ b/target/linux/brcm47xx/profiles/PS-1208MFG.mk
@@ -7,7 +7,7 @@
define Profile/Ps1208mfg
NAME:=Edimax PS-1208MFG
- PACKAGES:=-firewall -dropbear -dnsmasq -mtd -ppp -wpad-mini block-mount kmod-usb-storage kmod-usb2 kmod-usb-ohci -iptables -kmod-switch kmod-fs-ext4 block-extroot
+ PACKAGES:=-firewall -dropbear -dnsmasq -mtd -ppp -wpad-mini kmod-b44 block-mount kmod-usb-storage kmod-usb2 kmod-usb-ohci -iptables -kmod-switch kmod-fs-ext4 block-extroot
endef
define Profile/Ps1208mfg/Description
diff --git a/target/linux/brcm47xx/profiles/WGT634U.mk b/target/linux/brcm47xx/profiles/WGT634U.mk
index 81f59a729..689b673f3 100644
--- a/target/linux/brcm47xx/profiles/WGT634U.mk
+++ b/target/linux/brcm47xx/profiles/WGT634U.mk
@@ -7,7 +7,7 @@
define Profile/WGT634U
NAME:=Netgear WGT634U
- PACKAGES:=kmod-ath5k kmod-usb-core kmod-usb2 kmod-ocf kmod-crypto-ocf-ubsec-ssb
+ PACKAGES:=kmod-b44 kmod-ath5k kmod-usb-core kmod-usb2 kmod-ocf kmod-crypto-ocf-ubsec-ssb
endef
define Profile/WGT634U/Description
diff --git a/target/linux/brcm47xx/profiles/WL500GPv1-ATH.mk b/target/linux/brcm47xx/profiles/WL500GPv1-ATH.mk
index 4d50db347..3cdd8a0b3 100644
--- a/target/linux/brcm47xx/profiles/WL500GPv1-ATH.mk
+++ b/target/linux/brcm47xx/profiles/WL500GPv1-ATH.mk
@@ -7,7 +7,7 @@
define Profile/WL500GPv1
NAME:=ASUS WL-500g Premium v1 (Atheros WiFi using ath5k)
- PACKAGES:=kmod-ath5k kmod-usb-core kmod-usb-uhci kmod-usb2
+ PACKAGES:=kmod-b44 kmod-ath5k kmod-usb-core kmod-usb-uhci kmod-usb2
endef
define Profile/WL500GPv1/Description
diff --git a/target/linux/brcm47xx/profiles/WRTSL54GS.mk b/target/linux/brcm47xx/profiles/WRTSL54GS.mk
index 0e53c7d13..68d9a17fe 100644
--- a/target/linux/brcm47xx/profiles/WRTSL54GS.mk
+++ b/target/linux/brcm47xx/profiles/WRTSL54GS.mk
@@ -7,7 +7,7 @@
define Profile/WRTSL54GS
NAME:=Linksys WRTSL54GS
- PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-storage kmod-scsi-core kmod-fs-ext3 e2fsprogs kmod-b43
+ PACKAGES:=kmod-b44 kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-storage kmod-scsi-core kmod-fs-ext3 e2fsprogs kmod-b43
endef
define Profile/WRTSL54GS/Description