Remove extra code in arch/arm/*omap* to move it into omap-pool branch

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

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 3a2214cb37aba18fb5f4964223d79693902b1029..64ab386a65c775ff7553d24b65ab8c4928d64210 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -10,13 +10,10 @@ config ARCH_OMAP2420
        depends on ARCH_OMAP24XX
        select OMAP_DM_TIMER
        select ARCH_OMAP_OTG
-       select CPU_V6
 
 config ARCH_OMAP2430
        bool "OMAP2430 support"
        depends on ARCH_OMAP24XX
-       select ARCH_OMAP_OTG
-       select CPU_V6
 
 config ARCH_OMAP34XX
        bool "OMAP34xx Based System"
@@ -26,7 +23,6 @@ config ARCH_OMAP3430
        bool "OMAP3430 support"
        depends on ARCH_OMAP3 && ARCH_OMAP34XX
        select ARCH_OMAP_OTG
-       select CPU_V7
 
 comment "OMAP Board Type"
        depends on ARCH_OMAP2 || ARCH_OMAP3
@@ -35,100 +31,27 @@ config MACH_OMAP_GENERIC
        bool "Generic OMAP board"
        depends on ARCH_OMAP2 && ARCH_OMAP24XX
 
-config MACH_NOKIA_N800
-       bool "Nokia N800"
-       depends on ARCH_OMAP2420
-       select VIDEO_TCM825X if VIDEO_OMAP2 && VIDEO_HELPER_CHIPS_AUTO
-       select CBUS if VIDEO_TCM825X
-       select CBUS_RETU if VIDEO_TCM825X
-       select MENELAUS if VIDEO_TCM825X
-       select OMAP_GPIO_SWITCH
-
-config MACH_NOKIA_N810
-       bool "Nokia N810"
-       depends on MACH_NOKIA_N800
-
-config MACH_NOKIA_N810_WIMAX
-       bool "Nokia N810 WiMAX"
-       depends on MACH_NOKIA_N800
-       select MACH_NOKIA_N810
-
-config MACH_NOKIA_RX51
-       bool "Nokia RX-51 board"
-       depends on ARCH_OMAP3 && ARCH_OMAP34XX
-
-config MACH_OMAP2_TUSB6010
-       bool
-       depends on ARCH_OMAP2 && ARCH_OMAP2420
-       default y if MACH_NOKIA_N800
-
 config MACH_OMAP_H4
        bool "OMAP 2420 H4 board"
-       depends on ARCH_OMAP2 && ARCH_OMAP2420
+       depends on ARCH_OMAP2 && ARCH_OMAP24XX
        select OMAP_DEBUG_DEVICES
 
-config MACH_OMAP_H4_TUSB
-       bool "TUSB 6010 EVM board"
-       depends on MACH_OMAP_H4
-       select MACH_OMAP2_TUSB6010
-       help
-         Set this if you've got a TUSB6010 high speed USB board.
-         You may need to consult the schematics for your revisions
-         of the Menelaus and TUSB boards, and make changes to be
-         sure this is set up properly for your board stack.
-
-         Be sure to select OTG mode operation, not host-only or
-         peripheral-only.
-
-config MACH_OMAP_H4_OTG
-       bool "Use USB OTG connector, not device connector (S1.10)"
-       depends on MACH_OMAP_H4
-       help
-         Set this if you've set S1.10 (on the mainboard) to use the
-         Mini-AB (OTG) connector and OTG transceiver with the USB0
-         port, instead of the Mini-B ("download") connector with its
-         non-OTG transceiver.
-
-         Note that the "download" connector can be used to bootstrap
-         the system from the OMAP mask ROM.  Also, since this is a
-         development platform, you can also force the OTG port into
-         a non-OTG operational mode.
-
-config MACH_OMAP2_H4_USB1
-       bool "Use USB1 port, not UART2 (S3.3)"
-       depends on MACH_OMAP_H4
-       help
-         Set this if you've set SW3.3 (on the CPU card) so that the
-         expansion connectors receive USB1 signals instead of UART2.
-
 config MACH_OMAP_APOLLON
        bool "OMAP 2420 Apollon board"
-       depends on ARCH_OMAP2 && ARCH_OMAP2420
+       depends on ARCH_OMAP2 && ARCH_OMAP24XX
 
 config MACH_OMAP_2430SDP
        bool "OMAP 2430 SDP board"
-       depends on ARCH_OMAP2 && ARCH_OMAP2430
-
-config MACH_OMAP_LDP
-       bool "OMAP3 LDP board"
-       depends on ARCH_OMAP3 && ARCH_OMAP34XX
-
-config MACH_OMAP2EVM 
-       bool "OMAP 2530 EVM board"
        depends on ARCH_OMAP2 && ARCH_OMAP24XX
 
-config MACH_OMAP_3430SDP
-       bool "OMAP 3430 SDP board"
-       depends on ARCH_OMAP3 && ARCH_OMAP34XX
-
-config MACH_OMAP3EVM
-       bool "OMAP 3530 EVM board"
-       depends on ARCH_OMAP3 && ARCH_OMAP34XX
-
 config MACH_OMAP3_BEAGLE
        bool "OMAP3 BEAGLE board"
        depends on ARCH_OMAP3 && ARCH_OMAP34XX
 
+config MACH_OMAP_LDP
+       bool "OMAP3 LDP board"
+       depends on ARCH_OMAP3 && ARCH_OMAP34XX
+
 config MACH_OVERO
        bool "Gumstix Overo board"
        depends on ARCH_OMAP3 && ARCH_OMAP34XX