1 files changed, 89 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index b31b6f123122..b48bacf0a7aa 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -1,22 +1,77 @@
+if ARCH_OMAP2PLUS
+
+menu "TI OMAP2/3/4 Specific Features"
+
+config ARCH_OMAP2PLUS_TYPICAL
+        bool "Typical OMAP configuration"
+        default y
+        select AEABI
+        select REGULATOR
+        select PM
+        select PM_RUNTIME
+        select VFP
+        select NEON if ARCH_OMAP3 || ARCH_OMAP4
+        select SERIAL_8250
+        select SERIAL_CORE_CONSOLE
+        select SERIAL_8250_CONSOLE
+        select I2C
+        select I2C_OMAP
+        select MFD
+        select MENELAUS if ARCH_OMAP2
+        select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
+        select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
+        help
+          Compile a kernel suitable for booting most boards
+
+config ARCH_OMAP2
+        bool "TI OMAP2"
+        depends on ARCH_OMAP2PLUS
+        default y
+        select CPU_V6
+
+config ARCH_OMAP3
+        bool "TI OMAP3"
+        depends on ARCH_OMAP2PLUS
+        default y
+        select CPU_V7
+        select USB_ARCH_HAS_EHCI
+        select ARM_L1_CACHE_SHIFT_6
+
+config ARCH_OMAP4
+        bool "TI OMAP4"
+        default y
+        depends on ARCH_OMAP2PLUS
+        select CPU_V7
+        select ARM_GIC
+
 comment "OMAP Core Type"
         depends on ARCH_OMAP2
 
 config ARCH_OMAP2420
         bool "OMAP2420 support"
         depends on ARCH_OMAP2
+        default y
         select OMAP_DM_TIMER
         select ARCH_OMAP_OTG
 
 config ARCH_OMAP2430
         bool "OMAP2430 support"
         depends on ARCH_OMAP2
+        default y
         select ARCH_OMAP_OTG
 
 config ARCH_OMAP3430
         bool "OMAP3430 support"
         depends on ARCH_OMAP3
+        default y
         select ARCH_OMAP_OTG
 
+config OMAP_PACKAGE_ZAF
+       bool
+
+config OMAP_PACKAGE_ZAC
+       bool
+
 config OMAP_PACKAGE_CBC
        bool
 
@@ -35,6 +90,7 @@ comment "OMAP Board Type"
 config MACH_OMAP_GENERIC
         bool "Generic OMAP board"
         depends on ARCH_OMAP2
+        default y
 
 config MACH_OMAP2_TUSB6010
         bool
@@ -44,60 +100,75 @@ config MACH_OMAP2_TUSB6010
 config MACH_OMAP_H4
         bool "OMAP 2420 H4 board"
         depends on ARCH_OMAP2
+        default y
+        select OMAP_PACKAGE_ZAF
         select OMAP_DEBUG_DEVICES
 
 config MACH_OMAP_APOLLON
         bool "OMAP 2420 Apollon board"
         depends on ARCH_OMAP2
+        default y
+        select OMAP_PACKAGE_ZAC
 
 config MACH_OMAP_2430SDP
         bool "OMAP 2430 SDP board"
         depends on ARCH_OMAP2
+        default y
+        select OMAP_PACKAGE_ZAC
 
 config MACH_OMAP3_BEAGLE
         bool "OMAP3 BEAGLE board"
         depends on ARCH_OMAP3
+        default y
         select OMAP_PACKAGE_CBB
 
 config MACH_DEVKIT8000
         bool "DEVKIT8000 board"
         depends on ARCH_OMAP3
+        default y
         select OMAP_PACKAGE_CUS
         select OMAP_MUX
 
 config MACH_OMAP_LDP
         bool "OMAP3 LDP board"
         depends on ARCH_OMAP3
+        default y
         select OMAP_PACKAGE_CBB
 
 config MACH_OVERO
         bool "Gumstix Overo board"
         depends on ARCH_OMAP3
+        default y
         select OMAP_PACKAGE_CBB
 
 config MACH_OMAP3EVM
         bool "OMAP 3530 EVM board"
         depends on ARCH_OMAP3
+        default y
         select OMAP_PACKAGE_CBB
 
 config MACH_OMAP3517EVM
         bool "OMAP3517/ AM3517 EVM board"
         depends on ARCH_OMAP3
+        default y
         select OMAP_PACKAGE_CBB
 
 config MACH_OMAP3_PANDORA
         bool "OMAP3 Pandora"
         depends on ARCH_OMAP3
+        default y
         select OMAP_PACKAGE_CBB
 
 config MACH_OMAP3_TOUCHBOOK
         bool "OMAP3 Touch Book"
         depends on ARCH_OMAP3
+        default y
         select BACKLIGHT_CLASS_DEVICE
 
 config MACH_OMAP_3430SDP
         bool "OMAP 3430 SDP board"
         depends on ARCH_OMAP3
+        default y
         select OMAP_PACKAGE_CBB
 
 config MACH_NOKIA_N800
@@ -112,6 +183,8 @@ config MACH_NOKIA_N810_WIMAX
 config MACH_NOKIA_N8X0
         bool "Nokia N800/N810"
         depends on ARCH_OMAP2420
+        default y
+        select OMAP_PACKAGE_ZAC
         select MACH_NOKIA_N800
         select MACH_NOKIA_N810
         select MACH_NOKIA_N810_WIMAX
@@ -119,42 +192,55 @@ config MACH_NOKIA_N8X0
 config MACH_NOKIA_RX51
         bool "Nokia RX-51 board"
         depends on ARCH_OMAP3
+        default y
         select OMAP_PACKAGE_CBB
 
 config MACH_OMAP_ZOOM2
         bool "OMAP3 Zoom2 board"
         depends on ARCH_OMAP3
+        default y
         select OMAP_PACKAGE_CBB
 
 config MACH_OMAP_ZOOM3
         bool "OMAP3630 Zoom3 board"
         depends on ARCH_OMAP3
+        default y
         select OMAP_PACKAGE_CBP
 
 config MACH_CM_T35
         bool "CompuLab CM-T35 module"
         depends on ARCH_OMAP3
+        default y
         select OMAP_PACKAGE_CUS
         select OMAP_MUX
 
 config MACH_IGEP0020
         bool "IGEP v2 board"
         depends on ARCH_OMAP3
+        default y
         select OMAP_PACKAGE_CBB
 
 config MACH_SBC3530
         bool "OMAP3 SBC STALKER board"
         depends on ARCH_OMAP3
+        default y
         select OMAP_PACKAGE_CUS
         select OMAP_MUX
 
 config MACH_OMAP_3630SDP
         bool "OMAP3630 SDP board"
         depends on ARCH_OMAP3
+        default y
         select OMAP_PACKAGE_CBP
 
 config MACH_OMAP_4430SDP
         bool "OMAP 4430 SDP board"
+        default y
+        depends on ARCH_OMAP4
+
+config MACH_OMAP4_PANDA
+        bool "OMAP4 Panda Board"
+        default y
         depends on ARCH_OMAP4
 
 config OMAP3_EMU
@@ -176,3 +262,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