summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-08-27 13:32:10 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-08-27 13:32:10 +0000
commitbb9c5ecf26a93fc4d42858e09a805dcf4547c32c (patch)
treec6ea39be31fb47ac78ee935f0a4a1824951d6311
parentd07861c87d0e6a6105e042dbe8744f41466e8466 (diff)
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
-rw-r--r--target/Config.in13
-rw-r--r--target/linux/Config.in8
2 files changed, 16 insertions, 5 deletions
diff --git a/target/Config.in b/target/Config.in
index 2d3009112..fc35a9acc 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -7,6 +7,7 @@ config LINUX_2_6_AU1000
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 @@ config LINUX_2_6_ARUBA
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 @@ config LINUX_2_4_BRCM
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 @@ config LINUX_2_6_BRCM
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 @@ config LINUX_2_6_BRCM63XX
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 @@ config LINUX_2_6_XSCALE
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 @@ config LINUX_2_4_X86
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 @@ config LINUX_2_6_X86
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
@@ -188,6 +198,9 @@ config PCI_SUPPORT
config PCMCIA_SUPPORT
bool
+config USB_SUPPORT
+ bool
+
config BIG_ENDIAN
bool
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 9b505df13..1c1361e76 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -328,13 +328,11 @@ config PACKAGE_KMOD_NET_PRISM54
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
default m
config PACKAGE_KMOD_PCMCIA_SERIAL
@@ -346,11 +344,11 @@ config PACKAGE_KMOD_PCMCIA_SERIAL
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_AX25
config PACKAGE_KMOD_BLUETOOTH
prompt "kmod-bluetooth.................... Bluetooth drivers and network stack"
tristate
+ depends PCI_SUPPORT || USB_SUPPORT
default m
- default n if LINUX_2_4_AR531X
help
Bluetooth drivers and network stack