package wl and et and make them removable

SVN-Revision: 532

diff --git a/openwrt/package/linux/Config.in b/openwrt/package/linux/Config.in
index c06bcd2411d5089042103eee36eede03f78f3c35..b848572914980355bf766308d81abb6fb6e557f2 100644 (file)
--- a/openwrt/package/linux/Config.in
+++ b/openwrt/package/linux/Config.in
@@ -1,3 +1,15 @@
+config BR2_PACKAGE_KMOD_BRCM_WL
+       tristate "Broadcom Wireless Network Driver"
+       default y
+       help
+         Proprietary driver for Broadcom Wireless chipsets
+
+config BR2_PACKAGE_KMOD_BRCM_ET
+       tristate "Broadcom Ethernet Driver"
+       default y
+       help
+         Proprietary driver for Broadcom Ethernet chipsets
+
 config BR2_PACKAGE_KMOD_ARPT
        tristate "ARP firewalling support"
        default m

diff --git a/openwrt/package/linux/Makefile b/openwrt/package/linux/Makefile
index 771a9979d5505044f33719b72a12819f97fbd9f4..29a1bfa3091721ebb6efefda2699d8e67807863d 100644 (file)
--- a/openwrt/package/linux/Makefile
+++ b/openwrt/package/linux/Makefile
@@ -38,6 +38,12 @@ $$(PKG_$(1)): $(LINUX_DIR)/.modules_done
 
 endef
 
+$(eval $(call KMOD_template,BRCM_WL,brcm-wl,\
+       $(MODULES_DIR)/kernel/drivers/net/wl/wl.o \
+,CONFIG_WL))
+$(eval $(call KMOD_template,BRCM_ET,brcm-et,\
+       $(MODULES_DIR)/kernel/drivers/net/et/et.o \
+,CONFIG_ET))
 $(eval $(call KMOD_template,ARPT,arptables,\
        $(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.o \
 ,CONFIG_IP_NF_ARPTABLES))

diff --git a/openwrt/package/linux/control/kmod-brcm-et.control b/openwrt/package/linux/control/kmod-brcm-et.control
new file mode 100644 (file)
index 0000000..a99a79a
--- /dev/null
+++ b/openwrt/package/linux/control/kmod-brcm-et.control
@@ -0,0 +1,6 @@
+Package: kmod-brcm-et
+Priority: optional
+Section: sys
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: Proprietary driver for Broadcom Ethernet chipsets

diff --git a/openwrt/package/linux/control/kmod-brcm-wl.control b/openwrt/package/linux/control/kmod-brcm-wl.control
new file mode 100644 (file)
index 0000000..c8ec871
--- /dev/null
+++ b/openwrt/package/linux/control/kmod-brcm-wl.control
@@ -0,0 +1,6 @@
+Package: kmod-brcm-wl
+Priority: optional
+Section: sys
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: Proprietary driver for Broadcom Wireless chipsets

diff --git a/openwrt/package/linux/linux.mk b/openwrt/package/linux/linux.mk
index 5d55ac9f708fb29cb8c8767c46d68e9880dc7e15..1338079cf57d3f11e93e9b4ad663aa0cc7c9f122 100644 (file)
--- a/openwrt/package/linux/linux.mk
+++ b/openwrt/package/linux/linux.mk
@@ -94,8 +94,6 @@ $(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured
 
 $(TARGET_MODULES_DIR): 
        -mkdir -p $(TARGET_MODULES_DIR)
-       cp $(LINUX_DIR)/drivers/net/wl/wl.o $(TARGET_MODULES_DIR)
-       cp $(LINUX_DIR)/drivers/net/et/et.o $(TARGET_MODULES_DIR)
        cp $(LINUX_DIR)/drivers/net/diag/diag.o $(TARGET_MODULES_DIR)
 
 linux: $(LINUX_DIR)/.modules_done $(TARGET_MODULES_DIR)