Revert "ARM: OMAP2+: Fix multiple randconfig errors with SOC_OMAP and SOC_OMAP_NOOP"
This reverts commit c295fb633e321a7df3b8846c4eaddc5da3e0aaed.
This makes existing .config files bloated by selecting in all
omaps as noted by Russell King - ARM Linux <linux@arm.linux.org.uk>.
Signed-off-by: Tony Lindgren <tony@atomide.com>
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index c4ae0a7..337f98d 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -21,12 +21,16 @@
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 @@
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 @@
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 @@
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 @@
select OMAP_PACKAGE_CBS
select REGULATOR_FIXED_VOLTAGE if REGULATOR
-endif
config OMAP3_EMU
bool "OMAP3 debugging peripherals"
depends on ARCH_OMAP3