vserver 1.9.5.x5

[linux-2.6.git] / arch / arm / mach-omap / Kconfig

diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig
index 9fb70d5..f8d265d 100644 (file)
--- a/arch/arm/mach-omap/Kconfig
+++ b/arch/arm/mach-omap/Kconfig
@@ -5,58 +5,56 @@ menu "TI OMAP Implementations"
 comment "OMAP Core Type"
 
 config ARCH_OMAP730
+       depends on ARCH_OMAP
        bool "OMAP730 Based System"
-       select CPU_ARM926T
+       select ARCH_OMAP_OTG
 
 config ARCH_OMAP1510
+       depends on ARCH_OMAP
        default y
        bool "OMAP1510 Based System"
-       select CPU_ARM925T
-       select CPU_DCACHE_WRITETHROUGH
 
-config ARCH_OMAP1610
-       bool "OMAP1610 Based System"
-       select CPU_ARM926T
+config ARCH_OMAP16XX
+       depends on ARCH_OMAP
+       bool "OMAP16XX Based System"
+       select ARCH_OMAP_OTG
 
-config ARCH_OMAP5912
-       bool "OMAP5912 Based System"
-       select CPU_ARM926T
+config ARCH_OMAP_OTG
+       bool
 
 comment "OMAP Board Type"
 
 config MACH_OMAP_INNOVATOR
        bool "TI Innovator"
-       default y
-       depends on ARCH_OMAP1510 || ARCH_OMAP1610
+       depends on ARCH_OMAP1510 || ARCH_OMAP16XX
        help
           TI OMAP 1510 or 1610 Innovator board support. Say Y here if you
           have such a board.
 
 config MACH_OMAP_H2
        bool "TI H2 Support"
-       depends on ARCH_OMAP1610
-        select MACH_OMAP_INNOVATOR
+       depends on ARCH_OMAP16XX
        help
-         TI OMAP 1610 H2 board support. Say Y here if you have such
+         TI OMAP 1610/1611B H2 board support. Say Y here if you have such
          a board.
 
 config MACH_OMAP_H3
        bool "TI H3 Support"
-       depends on ARCH_OMAP1610
+       depends on ARCH_OMAP16XX
        help
-         TI OMAP 1610 H3 board support. Say Y here if you have such
+         TI OMAP 1710 H3 board support. Say Y here if you have such
          a board.
 
 config MACH_OMAP_H4
        bool "TI H4 Support"
-       depends on ARCH_OMAP1610
+       depends on ARCH_OMAP16XX
        help
          TI OMAP 1610 H4 board support. Say Y here if you have such
          a board.
 
 config MACH_OMAP_OSK
        bool "TI OSK Support"
-       depends on ARCH_OMAP5912
+       depends on ARCH_OMAP16XX
        help
          TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
           if you have such a board.
@@ -64,19 +62,16 @@ config MACH_OMAP_OSK
 config MACH_OMAP_PERSEUS2
        bool "TI Perseus2"
        depends on ARCH_OMAP730
-       select LEDS
-       select LEDS_TIMER
-       select LEDS_CPU
        help
          Support for TI OMAP 730 Perseus2 board. Say Y here if you have such
          a board.
 
 config MACH_OMAP_GENERIC
        bool "Generic OMAP board"
-       depends on ARCH_OMAP1510 || ARCH_OMAP1610
+       depends on ARCH_OMAP1510 || ARCH_OMAP16XX
        help
-          Support for generic OMAP-1510 or 1610 board with no
-          FPGA. Can be used as template for porting Linux to
+          Support for generic OMAP-1510, 1610 or 1710 board with
+          no FPGA. Can be used as template for porting Linux to
           custom OMAP boards. Say Y here if you have a custom
           board.
 
@@ -84,6 +79,7 @@ comment "OMAP Feature Selections"
 
 #config OMAP_BOOT_TAG
 #      bool "OMAP bootloader information passing"
+#        depends on ARCH_OMAP
 #        default n
 #        help
 #          Say Y, if you have a bootloader which passes information
@@ -91,6 +87,7 @@ comment "OMAP Feature Selections"
 
 config OMAP_MUX
        bool "OMAP multiplexing support"
+        depends on ARCH_OMAP
        default y
         help
           Pin multiplexing support for OMAP boards. If your bootloader
@@ -106,8 +103,18 @@ config OMAP_MUX_DEBUG
           This is useful if you want to find out the correct values of the
           multiplexing registers.
 
+config OMAP_MUX_WARNINGS
+       bool "Warn about pins the bootloader didn't set up"
+        depends on OMAP_MUX
+        default y
+        help
+         Choose Y here to warn whenever driver initialization logic needs
+         to change the pin multiplexing setup.  When there are no warnings
+         printed, it's safe to deselect OMAP_MUX for your product.
+
 choice
        prompt "Low-level debug console UART"
+       depends on ARCH_OMAP
        default OMAP_LL_DEBUG_UART1
 
 config OMAP_LL_DEBUG_UART1
@@ -129,7 +136,7 @@ config OMAP_ARM_195MHZ
 
 config OMAP_ARM_192MHZ
        bool "OMAP ARM 192 MHz CPU"
-       depends on ARCH_OMAP1610 || ARCH_OMAP5912
+       depends on ARCH_OMAP16XX
        help
           Enable 192MHz clock for OMAP CPU. If unsure, say N.
 
@@ -141,26 +148,26 @@ config OMAP_ARM_182MHZ
 
 config OMAP_ARM_168MHZ
        bool "OMAP ARM 168 MHz CPU"
-       depends on ARCH_OMAP1510 || ARCH_OMAP1610 || ARCH_OMAP730 || ARCH_OMAP5912
+       depends on ARCH_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730
        help
           Enable 168MHz clock for OMAP CPU. If unsure, say N.
 
 config OMAP_ARM_120MHZ
        bool "OMAP ARM 120 MHz CPU"
-       depends on ARCH_OMAP1510 || ARCH_OMAP1610 || ARCH_OMAP730
+       depends on ARCH_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730
        help
           Enable 120MHz clock for OMAP CPU. If unsure, say N.
 
 config OMAP_ARM_60MHZ
        bool "OMAP ARM 60 MHz CPU"
-       depends on ARCH_OMAP1510 || ARCH_OMAP1610 || ARCH_OMAP730
+       depends on ARCH_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730
         default y
        help
           Enable 60MHz clock for OMAP CPU. If unsure, say Y.
 
 config OMAP_ARM_30MHZ
        bool "OMAP ARM 30 MHz CPU"
-       depends on ARCH_OMAP1510 || ARCH_OMAP1610 || ARCH_OMAP730
+       depends on ARCH_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730
        help
           Enable 30MHz clock for OMAP CPU. If unsure, say N.