aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/Kconfig
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-03-07 14:05:13 -0800
committerOlof Johansson <olof@lixom.net>2012-03-07 14:05:13 -0800
commit412fe6b3a1f6fa6c88c11c8d2b2422b79342de8c (patch)
treed07592e2676135dd7cbcc8535fc3625179356a95 /arch/arm/mach-omap2/Kconfig
parentc6dbba0e45edb1a88d97bc8118c4e8332c603076 (diff)
parentf558b275439a9d14a1e2a754484f81ecebf56764 (diff)
Merge branch 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical
* 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: Revert "ARM: OMAP2+: Fix multiple randconfig errors with SOC_OMAP and SOC_OMAP_NOOP"
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
-rw-r--r--arch/arm/mach-omap2/Kconfig51
1 files changed, 17 insertions, 34 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index c4ae0a77f7b..337f98dd814 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -21,12 +21,16 @@ config ARCH_OMAP2PLUS_TYPICAL
Compile a kernel suitable for booting most boards
config ARCH_OMAP2
- bool
+ bool "TI OMAP2"
+ depends on ARCH_OMAP2PLUS
+ default y
select CPU_V6
select MULTI_IRQ_HANDLER
config ARCH_OMAP3
- bool
+ bool "TI OMAP3"
+ depends on ARCH_OMAP2PLUS
+ default y
select CPU_V7
select USB_ARCH_HAS_EHCI if USB_SUPPORT
select ARCH_HAS_OPP
@@ -35,7 +39,9 @@ config ARCH_OMAP3
select MULTI_IRQ_HANDLER
config ARCH_OMAP4
- bool
+ bool "TI OMAP4"
+ default y
+ depends on ARCH_OMAP2PLUS
select CACHE_L2X0
select CPU_V7
select ARM_GIC
@@ -50,58 +56,36 @@ config ARCH_OMAP4
select ARM_CPU_SUSPEND if PM
comment "OMAP Core Type"
-
-config SOC_OMAP
- bool
+ depends on ARCH_OMAP2
config SOC_OMAP2420
bool "OMAP2420 support"
+ depends on ARCH_OMAP2
default y
- select SOC_OMAP
- select ARCH_OMAP2
select OMAP_DM_TIMER
select ARCH_OMAP_OTG
config SOC_OMAP2430
bool "OMAP2430 support"
+ depends on ARCH_OMAP2
default y
- select SOC_OMAP
- select ARCH_OMAP2
select ARCH_OMAP_OTG
config SOC_OMAP3430
bool "OMAP3430 support"
+ depends on ARCH_OMAP3
default y
- select SOC_OMAP
- select ARCH_OMAP3
select ARCH_OMAP_OTG
config SOC_OMAPTI81XX
bool "TI81XX support"
+ depends on ARCH_OMAP3
default y
- select SOC_OMAP
- select ARCH_OMAP3
config SOC_OMAPAM33XX
bool "AM33XX support"
+ depends on ARCH_OMAP3
default y
- select SOC_OMAP
- select ARCH_OMAP3
-
-config SOC_OMAP44XX
- bool "OMAP44XX support"
- default y
- select SOC_OMAP
- select ARCH_OMAP4
-
-config SOC_OMAP_NOOP
- bool
- depends on !SOC_OMAP
- default y
- select ARCH_OMAP2
- select ARCH_OMAP3
- select ARCH_OMAP4
- select MACH_OMAP_GENERIC
config OMAP_PACKAGE_ZAF
bool
@@ -128,17 +112,17 @@ config OMAP_PACKAGE_CBS
bool
comment "OMAP Board Type"
+ depends on ARCH_OMAP2PLUS
config MACH_OMAP_GENERIC
bool "Generic OMAP2+ board"
+ depends on ARCH_OMAP2PLUS
select USE_OF
default y
help
Support for generic TI OMAP2+ boards using Flattened Device Tree.
More information at Documentation/devicetree
-if SOC_OMAP
-
config MACH_OMAP2_TUSB6010
bool
depends on ARCH_OMAP2 && SOC_OMAP2420
@@ -359,7 +343,6 @@ config MACH_OMAP4_PANDA
select OMAP_PACKAGE_CBS
select REGULATOR_FIXED_VOLTAGE if REGULATOR
-endif
config OMAP3_EMU
bool "OMAP3 debugging peripherals"
depends on ARCH_OMAP3