omap2/3/4: Move Kconfig options to mach-omap2/Kconfig

[mv-sheeva.git] / arch / arm / mach-omap2 / Kconfig

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index b31b6f1231227dd66b38b691a8b63c4e775963c9..d306aa1d2dfd58a8e63d30509cd4024d3b82fd92 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -1,3 +1,25 @@
+if ARCH_OMAP2PLUS
+
+menu "TI OMAP2/3/4 Specific Features"
+
+config ARCH_OMAP2
+       bool "TI OMAP2"
+       depends on ARCH_OMAP2PLUS
+       select CPU_V6
+
+config ARCH_OMAP3
+       bool "TI OMAP3"
+       depends on ARCH_OMAP2PLUS
+       select CPU_V7
+       select USB_ARCH_HAS_EHCI
+       select ARM_L1_CACHE_SHIFT_6
+
+config ARCH_OMAP4
+       bool "TI OMAP4"
+       depends on ARCH_OMAP2PLUS
+       select CPU_V7
+       select ARM_GIC
+
 comment "OMAP Core Type"
        depends on ARCH_OMAP2
 
@@ -17,6 +39,12 @@ config ARCH_OMAP3430
        depends on ARCH_OMAP3
        select ARCH_OMAP_OTG
 
+config OMAP_PACKAGE_ZAF
+       bool
+
+config OMAP_PACKAGE_ZAC
+       bool
+
 config OMAP_PACKAGE_CBC
        bool
 
@@ -44,15 +72,18 @@ config MACH_OMAP2_TUSB6010
 config MACH_OMAP_H4
        bool "OMAP 2420 H4 board"
        depends on ARCH_OMAP2
+       select OMAP_PACKAGE_ZAF
        select OMAP_DEBUG_DEVICES
 
 config MACH_OMAP_APOLLON
        bool "OMAP 2420 Apollon board"
        depends on ARCH_OMAP2
+       select OMAP_PACKAGE_ZAC
 
 config MACH_OMAP_2430SDP
        bool "OMAP 2430 SDP board"
        depends on ARCH_OMAP2
+       select OMAP_PACKAGE_ZAC
 
 config MACH_OMAP3_BEAGLE
        bool "OMAP3 BEAGLE board"
@@ -112,6 +143,7 @@ config MACH_NOKIA_N810_WIMAX
 config MACH_NOKIA_N8X0
        bool "Nokia N800/N810"
        depends on ARCH_OMAP2420
+       select OMAP_PACKAGE_ZAC
        select MACH_NOKIA_N800
        select MACH_NOKIA_N810
        select MACH_NOKIA_N810_WIMAX
@@ -176,3 +208,6 @@ config OMAP3_SDRC_AC_TIMING
          wish to say no.  Selecting yes without understanding what is
          going on could result in system crashes;
 
+endmenu
+
+endif