1 files changed, 16 insertions, 4 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 76efd438a140..7a0c31a6669e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -371,7 +371,6 @@ config ARCH_CNS3XXX
 config ARCH_CLPS711X
         bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
         select ARCH_REQUIRE_GPIOLIB
-        select ARCH_USES_GETTIMEOFFSET
         select AUTO_ZRELADDR
         select CLKDEV_LOOKUP
         select COMMON_CLK
@@ -938,17 +937,24 @@ config ARCH_DAVINCI
         help
           Support for TI's DaVinci platform.
 
-config ARCH_OMAP
-        bool "TI OMAP"
+config ARCH_OMAP1
+        bool "TI OMAP1"
         depends on MMU
         select ARCH_HAS_CPUFREQ
         select ARCH_HAS_HOLES_MEMORYMODEL
+        select ARCH_OMAP
         select ARCH_REQUIRE_GPIOLIB
+        select CLKDEV_LOOKUP
         select CLKSRC_MMIO
         select GENERIC_CLOCKEVENTS
+        select GENERIC_IRQ_CHIP
         select HAVE_CLK
+        select HAVE_IDE
+        select IRQ_DOMAIN
+        select NEED_MACH_IO_H if PCCARD
+        select NEED_MACH_MEMORY_H
         help
-          Support for TI's OMAP platform (OMAP1/2/3/4).
+          Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx)
 
 endchoice
 
@@ -1214,6 +1220,7 @@ config ARM_ERRATA_430973
 config ARM_ERRATA_458693
         bool "ARM errata: Processor deadlock when a false hazard is created"
         depends on CPU_V7
+        depends on !ARCH_MULTIPLATFORM
         help
           This option enables the workaround for the 458693 Cortex-A8 (r2p0)
           erratum. For very specific sequences of memory operations, it is
@@ -1227,6 +1234,7 @@ config ARM_ERRATA_458693
 config ARM_ERRATA_460075
         bool "ARM errata: Data written to the L2 cache can be overwritten with stale data"
         depends on CPU_V7
+        depends on !ARCH_MULTIPLATFORM
         help
           This option enables the workaround for the 460075 Cortex-A8 (r2p0)
           erratum. Any asynchronous access to the L2 cache may encounter a
@@ -1239,6 +1247,7 @@ config ARM_ERRATA_460075
 config ARM_ERRATA_742230
         bool "ARM errata: DMB operation may be faulty"
         depends on CPU_V7 && SMP
+        depends on !ARCH_MULTIPLATFORM
         help
           This option enables the workaround for the 742230 Cortex-A9
           (r1p0..r2p2) erratum. Under rare circumstances, a DMB instruction
@@ -1251,6 +1260,7 @@ config ARM_ERRATA_742230
 config ARM_ERRATA_742231
         bool "ARM errata: Incorrect hazard handling in the SCU may lead to data corruption"
         depends on CPU_V7 && SMP
+        depends on !ARCH_MULTIPLATFORM
         help
           This option enables the workaround for the 742231 Cortex-A9
           (r2p0..r2p2) erratum. Under certain conditions, specific to the
@@ -1301,6 +1311,7 @@ config PL310_ERRATA_727915
 config ARM_ERRATA_743622
         bool "ARM errata: Faulty hazard checking in the Store Buffer may lead to data corruption"
         depends on CPU_V7
+        depends on !ARCH_MULTIPLATFORM
         help
           This option enables the workaround for the 743622 Cortex-A9
           (r2p*) erratum. Under very rare conditions, a faulty
@@ -1314,6 +1325,7 @@ config ARM_ERRATA_743622
 config ARM_ERRATA_751472
         bool "ARM errata: Interrupted ICIALLUIS may prevent completion of broadcasted operation"
         depends on CPU_V7
+        depends on !ARCH_MULTIPLATFORM
         help
           This option enables the workaround for the 751472 Cortex-A9 (prior
           to r3p0) erratum. An interrupted ICIALLUIS operation may prevent the