clean up kernel modules, remove b44 references, as it's built-in now

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2945 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index 2dd2aba..b043d07 100644 (file)
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -269,7 +269,7 @@ config BR2_PACKAGE_KMOD_IDE
        prompt "kmod-ide.......................... IDE support"
        tristate
        default m
        prompt "kmod-ide.......................... IDE support"
        tristate
        default m

-       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_X86 || BR2_LINUX_2_6_BRCM
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM

        help
          Kernel modules for IDE support
          useful for usb mass storage devices (e.g. on WL-HDD)
        help
          Kernel modules for IDE support
          useful for usb mass storage devices (e.g. on WL-HDD)


@@ -356,7 +356,7 @@ comment "Multimedia devices support"
 config BR2_PACKAGE_KMOD_PWC
        prompt "kmod-pwc.......................... Kernel driver for USB Philips Cameras"
        tristate
 config BR2_PACKAGE_KMOD_PWC
        prompt "kmod-pwc.......................... Kernel driver for USB Philips Cameras"
        tristate

-       default n if BR2_LINUX_2_4_AR531X
+       depends BR2_PACKAGE_KMOD_USB

        default m
 
 config BR2_PACKAGE_KMOD_SOUNDCORE
        default m
 
 config BR2_PACKAGE_KMOD_SOUNDCORE


@@ -426,7 +426,7 @@ comment "Network devices support"
 config BR2_PACKAGE_KMOD_NET_3C59X
        prompt "kmod-net-3c59x.................... 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support"
        tristate
 config BR2_PACKAGE_KMOD_NET_3C59X
        prompt "kmod-net-3c59x.................... 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support"
        tristate

-       default n if BR2_LINUX_2_4_AR531X
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86

        default m
        help
          This option enables driver support for a large number of 10mbps and 
        default m
        help
          This option enables driver support for a large number of 10mbps and 


@@ -441,7 +441,7 @@ config BR2_PACKAGE_KMOD_NET_3C59X
 config BR2_PACKAGE_KMOD_NET_8139TOO
        prompt "kmod-net-8139too.................. RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support"
        tristate
 config BR2_PACKAGE_KMOD_NET_8139TOO
        prompt "kmod-net-8139too.................. RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support"
        tristate

-       default n if BR2_LINUX_2_4_AR531X
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86

        default m
        help
          This is a driver for the Fast Ethernet PCI network cards based on 
        default m
        help
          This is a driver for the Fast Ethernet PCI network cards based on 


@@ -450,7 +450,7 @@ config BR2_PACKAGE_KMOD_NET_8139TOO
 config BR2_PACKAGE_KMOD_NET_AIRO
        prompt "kmod-net-airo..................... Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards kernel support"
        tristate
 config BR2_PACKAGE_KMOD_NET_AIRO
        prompt "kmod-net-airo..................... Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards kernel support"
        tristate

-       default n if BR2_LINUX_2_4_AR531X
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86

        default m
        help
          This is the standard Linux driver to support Cisco/Aironet ISA and 
        default m
        help
          This is the standard Linux driver to support Cisco/Aironet ISA and 


@@ -466,22 +466,15 @@ config BR2_PACKAGE_KMOD_NET_AIRO
 config BR2_PACKAGE_KMOD_NET_E100
        prompt "kmod-net-e100..................... Intel(R) PRO/100+ cards kernel support"
        tristate
 config BR2_PACKAGE_KMOD_NET_E100
        prompt "kmod-net-e100..................... Intel(R) PRO/100+ cards kernel support"
        tristate

+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86

        default m
        help
          Intel(R) PRO/100+ cards kernel support
 
        default m
        help
          Intel(R) PRO/100+ cards kernel support
 

-config BR2_PACKAGE_KMOD_NET_B44
-       prompt "kmod-net-b44...................... Broadcom 44XX, 47XX ethernet driver"
-       tristate
-       depends !BR2_LINUX_2_6_BRCM && !BR2_LINUX_2_4_BRCM
-       default m
-       help
-         Free driver for Broadcom Ethernet chipsets
-

 config BR2_PACKAGE_KMOD_NET_HERMES
        prompt "kmod-net-hermes................... Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) kernel support"
        tristate
 config BR2_PACKAGE_KMOD_NET_HERMES
        prompt "kmod-net-hermes................... Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) kernel support"
        tristate

-       default n if BR2_LINUX_2_4_AR531X
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86

        default m
        help
          A driver for 802.11b wireless cards based based on the "Hermes" or 
        default m
        help
          A driver for 802.11b wireless cards based based on the "Hermes" or 


@@ -522,7 +515,7 @@ config BR2_PACKAGE_KMOD_NET_HERMES_PLX
 config BR2_PACKAGE_KMOD_NET_NATSEMI
        prompt "kmod-net-natsemi.................. National Semiconductor DP8381x series PCI Ethernet kernel support"
        tristate
 config BR2_PACKAGE_KMOD_NET_NATSEMI
        prompt "kmod-net-natsemi.................. National Semiconductor DP8381x series PCI Ethernet kernel support"
        tristate

-       default n if BR2_LINUX_2_4_AR531X
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_6_ARUBA

        default m
        help
          This driver is for the National Semiconductor DP83810 series, 
        default m
        help
          This driver is for the National Semiconductor DP83810 series, 


@@ -532,7 +525,7 @@ config BR2_PACKAGE_KMOD_NET_NATSEMI
 config BR2_PACKAGE_KMOD_NET_PRISM54
        prompt "kmod-net-prism54.................. Intersil Prism GT/Duette/Indigo PCI/PCMCIA cards kernel support"
        tristate
 config BR2_PACKAGE_KMOD_NET_PRISM54
        prompt "kmod-net-prism54.................. Intersil Prism GT/Duette/Indigo PCI/PCMCIA cards kernel support"
        tristate

-       default n if BR2_LINUX_2_4_AR531X
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM

        default m
        help
          Enable PCI and Cardbus support for the following chipset based cards: 
        default m
        help
          Enable PCI and Cardbus support for the following chipset based cards: 


@@ -574,7 +567,7 @@ config BR2_PACKAGE_KMOD_PCMCIA_CORE
        prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support"
        depends BR2_LINUX_PCMCIA_SUPPORT
        tristate
        prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support"
        depends BR2_LINUX_PCMCIA_SUPPORT
        tristate

-       default n if BR2_LINUX_2_4_AR531X
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM

        default m
 
 config BR2_PACKAGE_KMOD_PCMCIA_SERIAL
        default m
 
 config BR2_PACKAGE_KMOD_PCMCIA_SERIAL

diff --git a/openwrt/target/linux/control/kmod-net-b44.control b/openwrt/target/linux/control/kmod-net-b44.control
deleted file mode 100644 (file)
index e70e2fb..0000000
--- a/openwrt/target/linux/control/kmod-net-b44.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: kmod-net-b44
-Priority: optional
-Section: sys
-Description: Free driver for Broadcom 44Xx, 47XX Ethernet chipset

diff --git a/openwrt/target/linux/generic-2.4/modules.mk b/openwrt/target/linux/generic-2.4/modules.mk
index 6aea742..9efcce7 100644 (file)
--- a/openwrt/target/linux/generic-2.4/modules.mk
+++ b/openwrt/target/linux/generic-2.4/modules.mk
@@ -201,10 +201,6 @@ $(eval $(call KMOD_template,NET_AIRO,net-airo,\
        $(MODULES_DIR)/kernel/drivers/net/wireless/airo.o \
 ,CONFIG_AIRO,,10,airo))
 
        $(MODULES_DIR)/kernel/drivers/net/wireless/airo.o \
 ,CONFIG_AIRO,,10,airo))
 

-$(eval $(call KMOD_template,NET_B44,net-b44,\
-       $(MODULES_DIR)/kernel/drivers/net/b44.o \
-,CONFIG_B44,,10,b44))
-

 $(eval $(call KMOD_template,NET_E100,net-e100,\
        $(MODULES_DIR)/kernel/drivers/net/e100.o \
 ,CONFIG_E100,,10,e100))
 $(eval $(call KMOD_template,NET_E100,net-e100,\
        $(MODULES_DIR)/kernel/drivers/net/e100.o \
 ,CONFIG_E100,,10,e100))

diff --git a/openwrt/target/linux/generic-2.6/modules.mk b/openwrt/target/linux/generic-2.6/modules.mk
index f450e4b..318190b 100644 (file)
--- a/openwrt/target/linux/generic-2.6/modules.mk
+++ b/openwrt/target/linux/generic-2.6/modules.mk
@@ -220,10 +220,6 @@ $(eval $(call KMOD_template,NET_AIRO,net-airo,\
        $(MODULES_DIR)/kernel/drivers/net/wireless/airo.ko \
 ,CONFIG_AIRO,,10,airo))
 
        $(MODULES_DIR)/kernel/drivers/net/wireless/airo.ko \
 ,CONFIG_AIRO,,10,airo))
 

-$(eval $(call KMOD_template,NET_B44,net-b44,\
-       $(MODULES_DIR)/kernel/drivers/net/b44.ko \
-,CONFIG_B44,,10,b44))
-

 $(eval $(call KMOD_template,NET_E100,net-e100,\
        $(MODULES_DIR)/kernel/drivers/net/e100.ko \
 ,CONFIG_E100,,10,e100))
 $(eval $(call KMOD_template,NET_E100,net-e100,\
        $(MODULES_DIR)/kernel/drivers/net/e100.ko \
 ,CONFIG_E100,,10,e100))

diff --git a/openwrt/target/linux/imagebuilder/lists/default.brcm-2.6 b/openwrt/target/linux/imagebuilder/lists/default.brcm-2.6
index 0fc71db..13f7878 100644 (file)
--- a/openwrt/target/linux/imagebuilder/lists/default.brcm-2.6
+++ b/openwrt/target/linux/imagebuilder/lists/default.brcm-2.6
@@ -5,7 +5,6 @@ busybox
 dnsmasq
 dropbear
 iptables
 dnsmasq
 dropbear
 iptables

-kmod-net-b44

 kmod-madwifi
 kmod-ppp
 kmod-pppoe
 kmod-madwifi
 kmod-ppp
 kmod-pppoe

diff --git a/openwrt/target/linux/imagebuilder/lists/micro.brcm-2.6 b/openwrt/target/linux/imagebuilder/lists/micro.brcm-2.6
index 069aa24..83a1cc2 100644 (file)
--- a/openwrt/target/linux/imagebuilder/lists/micro.brcm-2.6
+++ b/openwrt/target/linux/imagebuilder/lists/micro.brcm-2.6
@@ -5,7 +5,6 @@ busybox
 dnsmasq
 dropbear
 iptables
 dnsmasq
 dropbear
 iptables

-kmod-net-b44

 kmod-madwifi
 libgcc
 mtd
 kmod-madwifi
 libgcc
 mtd

diff --git a/openwrt/target/linux/imagebuilder/lists/pptp.brcm-2.6 b/openwrt/target/linux/imagebuilder/lists/pptp.brcm-2.6
index 0097da2..fdd62c5 100644 (file)
--- a/openwrt/target/linux/imagebuilder/lists/pptp.brcm-2.6
+++ b/openwrt/target/linux/imagebuilder/lists/pptp.brcm-2.6
@@ -5,7 +5,6 @@ busybox
 dnsmasq
 dropbear
 iptables
 dnsmasq
 dropbear
 iptables

-kmod-net-b44

 kmod-madwifi
 kmod-ppp
 kmod-gre
 kmod-madwifi
 kmod-ppp
 kmod-gre

diff --git a/openwrt/target/linux/package/hostap/Config.in b/openwrt/target/linux/package/hostap/Config.in
index 700eb96..e4f7a5c 100644 (file)
--- a/openwrt/target/linux/package/hostap/Config.in
+++ b/openwrt/target/linux/package/hostap/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_KMOD_HOSTAP
        prompt "kmod-hostap....................... Host AP support for Prism2/2.5/3 IEEE 802.11b"
        tristate
 config BR2_PACKAGE_KMOD_HOSTAP
        prompt "kmod-hostap....................... Host AP support for Prism2/2.5/3 IEEE 802.11b"
        tristate

+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM

        default m if CONFIG_DEVEL
        help
          A driver for 802.11b wireless cards based on Intersil Prism2/2.5/3
        default m if CONFIG_DEVEL
        help
          A driver for 802.11b wireless cards based on Intersil Prism2/2.5/3

diff --git a/openwrt/target/linux/package/madwifi/Config.in b/openwrt/target/linux/package/madwifi/Config.in
index 70cd2af..b554e67 100644 (file)
--- a/openwrt/target/linux/package/madwifi/Config.in
+++ b/openwrt/target/linux/package/madwifi/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_KMOD_MADWIFI
        prompt "kmod-madwifi...................... Atheros Wifi driver"
        tristate
 config BR2_PACKAGE_KMOD_MADWIFI
        prompt "kmod-madwifi...................... Atheros Wifi driver"
        tristate

-       default y if BR2_LINUX_2_6_BRCM
+       default y if BR2_LINUX_2_6_BRCM || BR2_LINUX_2_6_ARUBA || BR2_LINUX_2_4_AR531X

        default m if CONFIG_DEVEL
        default n
        help
        default m if CONFIG_DEVEL
        default n
        help