aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-01-03 02:00:25 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-01-03 02:00:25 +0000
commit8f6bdcffa154191ac4a24a689fc4a66056411407 (patch)
treebf20edfa8cb3afb8085da32e217b0d45b8583697
parent22d62d311a5049e5c163fa8ec61ee142722fd92a (diff)
downloadupstream-8f6bdcffa154191ac4a24a689fc4a66056411407.tar.gz
upstream-8f6bdcffa154191ac4a24a689fc4a66056411407.tar.bz2
upstream-8f6bdcffa154191ac4a24a689fc4a66056411407.zip
brcm47xx: build b44 as a module
SVN-Revision: 34994
-rw-r--r--package/kernel/modules/netdevices.mk2
-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
11 files changed, 10 insertions, 13 deletions
diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk
index bab3d70947..83d7c5f56e 100644
--- a/package/kernel/modules/netdevices.mk
+++ b/package/kernel/modules/netdevices.mk
@@ -419,7 +419,7 @@ $(eval $(call KernelPackage,e1000e))
define KernelPackage/b44
TITLE:=Broadcom 44xx driver
KCONFIG:=CONFIG_B44
- DEPENDS:=@PCI_SUPPORT +kmod-ssb
+ DEPENDS:=@PCI_SUPPORT +!TARGET_brcm47xx:kmod-ssb
SUBMENU:=$(NETWORK_DEVICES_MENU)
FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/b44.ko
AUTOLOAD:=$(call AutoLoad,50,b44)
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 3ca8456ffb..d4a3b682c8 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 421590c149..ae56ccf4dc 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 7880ce80f6..54e3909b68 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 1464b7e15f..bad38de671 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 32baa089aa..56a505a90e 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 04ad25dc67..d04813692a 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 5d7388ba1b..8d8aa687b6 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 81f59a7294..689b673f3e 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 4d50db3474..3cdd8a0b33 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 0e53c7d138..68d9a17fe8 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