introduce USB_SUPPORT, clean up some dependencies
introduce USB_SUPPORT, clean up some dependencies

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4690 3c298f89-4303-0410-b956-a3cf2f4a3e73

--- a/target/Config.in
+++ b/target/Config.in
@@ -7,6 +7,7 @@
 	select mipsel
 	select LINUX_2_6
 	select PCI_SUPPORT
+	select USB_SUPPORT
 	help
 	  Build firmware for AMD Alchemy 1500 boards
 	  (e.g. 4G-Systems Mesh/Access Cube ...)
@@ -16,6 +17,7 @@
 	select mips
 	select LINUX_2_6
 	select PCI_SUPPORT
+	select USB_SUPPORT
 	select BIG_ENDIAN
 	help
           Build firmware images for Aruba boards 
@@ -34,6 +36,7 @@
 	bool "Broadcom BCM47xx/53xx [2.4]"
 	select mipsel
 	select PCI_SUPPORT
+	select USB_SUPPORT
 	select PCMCIA_SUPPORT
 	help
 	  Build firmware images for Broadcom based routers
@@ -48,6 +51,7 @@
 	select mipsel
 	select LINUX_2_6
 	select PCI_SUPPORT
+	select USB_SUPPORT
 	#select PCMCIA_SUPPORT
 	help
 	  Build firmware images for Broadcom based routers
@@ -59,6 +63,7 @@
 	select mips
 	select LINUX_2_6
 	select PCI_SUPPORT
+	select USB_SUPPORT
 	select PCMCIA_SUPPORT
 	help
 	  Build firmware images for Broadcom based xDSL/routers
@@ -70,6 +75,7 @@
 	select LINUX_2_6
 	select BIG_ENDIAN
 	select PCI_SUPPORT
+	select USB_SUPPORT
 
 config LINUX_2_6_MAGICBOX
 	bool "Magicbox [2.6]"
@@ -95,6 +101,8 @@
 	bool "x86 [2.4]"
 	select i386
 	select LINUX_2_4
+	select PCI_SUPPORT
+	select USB_SUPPORT
 	select PCMCIA_SUPPORT
 	help
 	  Build firmware images for x86 based boards
@@ -104,6 +112,8 @@
 	bool "x86 [2.6]"
 	select i386
 	select LINUX_2_6
+	select PCI_SUPPORT
+	select USB_SUPPORT
 	select PCMCIA_SUPPORT
 	help
 	  Build firmware images for x86 based boards
@@ -186,6 +196,9 @@
 	bool
 
 config PCMCIA_SUPPORT
+	bool
+
+config USB_SUPPORT
 	bool
 
 config BIG_ENDIAN

--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -328,13 +328,11 @@
 endmenu
 
 menu "PCMCIA/CardBus support"
-	depends LINUX_2_4_X86 || LINUX_2_6_X86 || LINUX_2_4_BRCM || LINUX_2_6_BRCM
+	depends PCMCIA_SUPPORT
 
 config PACKAGE_KMOD_PCMCIA_CORE
 	prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support"
-	depends PCMCIA_SUPPORT
-	tristate
-	depends LINUX_2_4_X86 || LINUX_2_6_X86 || LINUX_2_4_BRCM || LINUX_2_6_BRCM
+	tristate
 	default m
 
 config PACKAGE_KMOD_PCMCIA_SERIAL
@@ -346,11 +344,11 @@
 endmenu
 
 menu "USB support"
+	depends USB_SUPPORT
 
 config PACKAGE_KMOD_USB
 	prompt "kmod-usb-core..................... USB support"
 	tristate
-	default n if LINUX_2_4_AR531X
 	default m
 
 config PACKAGE_KMOD_USB_UHCI 
@@ -468,8 +466,8 @@
 config PACKAGE_KMOD_BLUETOOTH
 	prompt "kmod-bluetooth.................... Bluetooth drivers and network stack"
 	tristate
-	default m
-	default n if LINUX_2_4_AR531X
+	depends PCI_SUPPORT || USB_SUPPORT
+	default m
 	help
 	  Bluetooth drivers and network stack
 

comments