[ARM] Clean up footbridge configuration.

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a14e129826d7bec214282e56f2930fd0ecba8f85..73a88a51b269a8dae2e13fc3bbb7ee5a43cbf8a2 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -83,6 +83,8 @@ config ARCH_CLPS711X
 
 config ARCH_CO285
        bool "Co-EBSA285"
+       select FOOTBRIDGE
+       select FOOTBRIDGE_ADDIN
 
 config ARCH_EBSA110
        bool "EBSA-110"
@@ -101,6 +103,7 @@ config ARCH_CAMELOT
 
 config ARCH_FOOTBRIDGE
        bool "FootBridge"
+       select FOOTBRIDGE
 
 config ARCH_INTEGRATOR
        bool "Integrator"
@@ -213,28 +216,6 @@ config TIMER_ACORN
        depends on ARCH_ACORN || ARCH_CLPS7500
        default y
 
-#####################################################################
-# Footbridge support
-config FOOTBRIDGE
-       bool
-       depends on ARCH_CO285 || ARCH_FOOTBRIDGE
-       default y
-
-config FOOTBRIDGE_HOST
-       bool
-       depends on ARCH_CATS || ARCH_EBSA285_HOST || ARCH_NETWINDER || ARCH_PERSONAL_SERVER
-       default y
-
-config FOOTBRIDGE_ADDIN
-       bool
-       depends on ARCH_CO285 || ARCH_EBSA285_ADDIN
-       default y
-
-config ARCH_EBSA285
-       bool
-       depends on ARCH_EBSA285_HOST || ARCH_EBSA285_ADDIN
-       default y
-
 #####################################################################
 # SA1111 support
 config SA1111

diff --git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig
index 1eaea0b87f2a60e060778b215ef7f232c31a5ce5..fc3250d091c9cbfadf2e1b682837ad98359b8237 100644 (file)
--- a/arch/arm/mach-footbridge/Kconfig
+++ b/arch/arm/mach-footbridge/Kconfig
@@ -4,6 +4,7 @@ menu "Footbridge Implementations"
 
 config ARCH_CATS
        bool "CATS"
+       select FOOTBRIDGE_HOST
        help
          Say Y here if you intend to run this kernel on the CATS.
 
@@ -11,6 +12,7 @@ config ARCH_CATS
 
 config ARCH_PERSONAL_SERVER
        bool "Compaq Personal Server"
+       select FOOTBRIDGE_HOST
        ---help---
          Say Y here if you intend to run this kernel on the Compaq
          Personal Server.
@@ -28,6 +30,8 @@ config ARCH_PERSONAL_SERVER
 
 config ARCH_EBSA285_ADDIN
        bool "EBSA285 (addin mode)"
+       select ARCH_EBSA285
+       select FOOTBRIDGE_ADDIN
        help
          Say Y here if you intend to run this kernel on the EBSA285 card
          in addin mode.
@@ -36,6 +40,8 @@ config ARCH_EBSA285_ADDIN
 
 config ARCH_EBSA285_HOST
        bool "EBSA285 (host mode)"
+       select ARCH_EBSA285
+       select FOOTBRIDGE_HOST
        help
          Say Y here if you intend to run this kernel on the EBSA285 card
          in host ("central function") mode.
@@ -44,6 +50,7 @@ config ARCH_EBSA285_HOST
 
 config ARCH_NETWINDER
        bool "NetWinder"
+       select FOOTBRIDGE_HOST
        help
          Say Y here if you intend to run this kernel on the Rebel.COM
          NetWinder.  Information about this machine can be found at:
@@ -54,4 +61,20 @@ config ARCH_NETWINDER
 
 endmenu
 
+# Footbridge support
+config FOOTBRIDGE
+       bool
+
+# Footbridge in host mode
+config FOOTBRIDGE_HOST
+       bool
+
+# Footbridge in addin mode
+config FOOTBRIDGE_ADDIN
+       bool
+
+# EBSA285 board in either host or addin mode
+config ARCH_EBSA285
+       bool
+
 endif