1 files changed, 76 insertions, 48 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4039a133006..b92925c7017 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -8,6 +8,7 @@ mainmenu "Linux Kernel Configuration"
 config ARM
         bool
         default y
+        select HAVE_IDE
         select RTC_LIB
         select SYS_SUPPORTS_APM_EMULATION
         select HAVE_OPROFILE
@@ -83,6 +84,11 @@ config STACKTRACE_SUPPORT
         bool
         default y
 
+config HAVE_LATENCYTOP_SUPPORT
+        bool
+        depends on !SMP
+        default y
+
 config LOCKDEP_SUPPORT
         bool
         default y
@@ -146,6 +152,10 @@ config FIQ
 config ARCH_MTD_XIP
         bool
 
+config GENERIC_HARDIRQS_NO__DO_IRQ
+        bool
+        def_bool y
+
 if OPROFILE
 
 config OPROFILE_ARMV6
@@ -223,7 +233,6 @@ config ARCH_CLPS7500
         select TIMER_ACORN
         select ISA
         select NO_IOPORT
-        select HAVE_IDE
         help
           Support for the Cirrus Logic PS7500FE system-on-a-chip.
 
@@ -232,14 +241,6 @@ config ARCH_CLPS711X
         help
           Support for Cirrus Logic 711x/721x based boards.
 
-config ARCH_CO285
-        bool "Co-EBSA285"
-        select FOOTBRIDGE
-        select FOOTBRIDGE_ADDIN
-        select HAVE_IDE
-        help
-          Support for Intel's EBSA285 companion chip.
-
 config ARCH_EBSA110
         bool "EBSA-110"
         select ISA
@@ -255,13 +256,13 @@ config ARCH_EP93XX
         select ARM_AMBA
         select ARM_VIC
         select GENERIC_GPIO
+        select HAVE_GPIO_LIB
         help
           This enables support for the Cirrus EP93xx series of CPUs.
 
 config ARCH_FOOTBRIDGE
         bool "FootBridge"
         select FOOTBRIDGE
-        select HAVE_IDE
         help
           Support for systems based on the DC21285 companion chip
           ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
@@ -300,7 +301,8 @@ config ARCH_IOP32X
         depends on MMU
         select PLAT_IOP
         select PCI
-        select HAVE_IDE
+        select GENERIC_GPIO
+        select HAVE_GPIO_LIB
         help
           Support for Intel's 80219 and IOP32X (XScale) family of
           processors.
@@ -310,14 +312,14 @@ config ARCH_IOP33X
         depends on MMU
         select PLAT_IOP
         select PCI
-        select HAVE_IDE
+        select GENERIC_GPIO
+        select HAVE_GPIO_LIB
         help
           Support for Intel's IOP33X (XScale) family of processors.
 
 config ARCH_IXP23XX
         bool "IXP23XX-based"
         depends on MMU
-        select HAVE_IDE
         select PCI
         help
           Support for Intel's IXP23xx (XScale) family of processors.
@@ -335,14 +337,12 @@ config ARCH_IXP4XX
         select GENERIC_GPIO
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
-        select HAVE_IDE
         help
           Support for Intel's IXP4XX (XScale) family of processors.
 
 config ARCH_L7200
         bool "LinkUp-L7200"
         select FIQ
-        select HAVE_IDE
         help
           Say Y here if you intend to run this kernel on a LinkUp Systems
           L7200 Software Development Board which uses an ARM720T processor.
@@ -353,6 +353,16 @@ config ARCH_L7200
           If you have any questions or comments about the Linux kernel port
           to this board, send e-mail to <sjhill@cotw.com>.
 
+config ARCH_KIRKWOOD
+        bool "Marvell Kirkwood"
+        select PCI
+        select GENERIC_TIME
+        select GENERIC_CLOCKEVENTS
+        select PLAT_ORION
+        help
+          Support for the following Marvell Kirkwood series SoCs:
+          88F6180, 88F6192 and 88F6281.
+
 config ARCH_KS8695
         bool "Micrel/Kendin KS8695"
         select GENERIC_GPIO
@@ -371,21 +381,42 @@ config ARCH_NS9XXX
 
           <http://www.digi.com/products/microprocessors/index.jsp>
 
+config ARCH_LOKI
+        bool "Marvell Loki (88RC8480)"
+        select GENERIC_TIME
+        select GENERIC_CLOCKEVENTS
+        select PLAT_ORION
+        help
+          Support for the Marvell Loki (88RC8480) SoC.
+
+config ARCH_MV78XX0
+        bool "Marvell MV78xx0"
+        select PCI
+        select GENERIC_TIME
+        select GENERIC_CLOCKEVENTS
+        select PLAT_ORION
+        help
+          Support for the following Marvell MV78xx0 series SoCs:
+          MV781x0, MV782x0.
+
 config ARCH_MXC
         bool "Freescale MXC/iMX-based"
         select ARCH_MTD_XIP
         help
           Support for Freescale MXC/iMX-based family of processors
 
-config ARCH_ORION
+config ARCH_ORION5X
         bool "Marvell Orion"
         depends on MMU
         select PCI
         select GENERIC_GPIO
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
+        select PLAT_ORION
         help
-          Support for Marvell Orion System on Chip family.
+          Support for the following Marvell Orion 5x series SoCs:
+          Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),
+          Orion-2 (5281).
 
 config ARCH_PNX4008
         bool "Philips Nexperia PNX4008 Mobile"
@@ -397,7 +428,6 @@ config ARCH_PXA
         depends on MMU
         select ARCH_MTD_XIP
         select GENERIC_GPIO
-        select HAVE_IDE
         select HAVE_GPIO_LIB
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
@@ -411,9 +441,9 @@ config ARCH_RPC
         select FIQ
         select TIMER_ACORN
         select ARCH_MAY_HAVE_PC_FDC
+        select HAVE_PATA_PLATFORM
         select ISA_DMA_API
         select NO_IOPORT
-        select HAVE_IDE
         help
           On the Acorn Risc-PC, Linux can support the internal IDE disk and
           CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -422,17 +452,20 @@ config ARCH_SA1100
         bool "SA1100-based"
         select ISA
         select ARCH_DISCONTIGMEM_ENABLE
+        select ARCH_SPARSEMEM_ENABLE
+        select ARCH_SELECT_MEMORY_MODEL
         select ARCH_MTD_XIP
         select GENERIC_GPIO
         select GENERIC_TIME
-        select HAVE_IDE
+        select GENERIC_CLOCKEVENTS
+        select TICK_ONESHOT
+        select HAVE_GPIO_LIB
         help
           Support for StrongARM 11x0 based boards.
 
 config ARCH_S3C2410
         bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443"
         select GENERIC_GPIO
-        select HAVE_IDE
         help
           Samsung S3C2410X CPU based systems, such as the Simtec Electronics
           BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@ -440,7 +473,6 @@ config ARCH_S3C2410
 
 config ARCH_SHARK
         bool "Shark"
-        select HAVE_IDE
         select ISA
         select ISA_DMA
         select PCI
@@ -450,7 +482,6 @@ config ARCH_SHARK
 
 config ARCH_LH7A40X
         bool "Sharp LH7A40X"
-        select HAVE_IDE
         help
           Say Y here for systems based on one of the Sharp LH7A40X
           System on a Chip processors.  These CPUs include an ARM922T
@@ -468,6 +499,7 @@ config ARCH_DAVINCI
 config ARCH_OMAP
         bool "TI OMAP"
         select GENERIC_GPIO
+        select HAVE_GPIO_LIB
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
         help
@@ -506,6 +538,10 @@ source "arch/arm/mach-ixp2000/Kconfig"
 
 source "arch/arm/mach-ixp23xx/Kconfig"
 
+source "arch/arm/mach-loki/Kconfig"
+
+source "arch/arm/mach-mv78xx0/Kconfig"
+
 source "arch/arm/mach-pxa/Kconfig"
 
 source "arch/arm/mach-sa1100/Kconfig"
@@ -516,7 +552,9 @@ source "arch/arm/mach-omap1/Kconfig"
 
 source "arch/arm/mach-omap2/Kconfig"
 
-source "arch/arm/mach-orion/Kconfig"
+source "arch/arm/mach-orion5x/Kconfig"
+
+source "arch/arm/mach-kirkwood/Kconfig"
 
 source "arch/arm/plat-s3c24xx/Kconfig"
 source "arch/arm/plat-s3c/Kconfig"
@@ -563,6 +601,9 @@ config ARCH_ACORN
 config PLAT_IOP
         bool
 
+config PLAT_ORION
+        bool
+
 source arch/arm/mm/Kconfig
 
 config IWMMXT
@@ -650,7 +691,7 @@ source "kernel/time/Kconfig"
 
 config SMP
         bool "Symmetric Multi-Processing (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && REALVIEW_EB_ARM11MP
+        depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP)
         help
           This enables support for systems with more than one CPU. If you have
           a system with only one CPU, like most personal computers, say N. If
@@ -683,7 +724,7 @@ config HOTPLUG_CPU
 
 config LOCAL_TIMERS
         bool "Use local timer interrupts"
-        depends on SMP && REALVIEW_EB_ARM11MP
+        depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP)
         default y
         help
           Enable support for local timers on SMP platforms, rather then the
@@ -704,27 +745,6 @@ config PREEMPT
           Say Y here if you are building a kernel for a desktop, embedded
           or real-time system.  Say N if you are unsure.
 
-config NO_IDLE_HZ
-        bool "Dynamic tick timer"
-        depends on !GENERIC_CLOCKEVENTS
-        help
-          Select this option if you want to disable continuous timer ticks
-          and have them programmed to occur as required. This option saves
-          power as the system can remain in idle state for longer.
-
-          By default dynamic tick is disabled during the boot, and can be
-          manually enabled with:
-
-            echo 1 > /sys/devices/system/timer/timer0/dyn_tick
-
-          Alternatively, if you want dynamic tick automatically enabled
-          during boot, pass "dyntick=enable" via the kernel command string.
-
-          Please note that dynamic tick may affect the accuracy of
-          timekeeping on some platforms depending on the implementation.
-          Currently at least OMAP, PXA2xx and SA11x0 platforms are known
-          to have accurate timekeeping with dynamic tick.
-
 config HZ
         int
         default 128 if ARCH_L7200
@@ -774,6 +794,12 @@ config ARCH_DISCONTIGMEM_ENABLE
           or have huge holes in the physical address space for other reasons.
           See <file:Documentation/vm/numa> for more.
 
+config ARCH_SPARSEMEM_ENABLE
+        bool
+
+config ARCH_SELECT_MEMORY_MODEL
+        bool
+
 config NODES_SHIFT
         int
         default "4" if ARCH_LH7A40X
@@ -784,7 +810,7 @@ source "mm/Kconfig"
 
 config LEDS
         bool "Timer and CPU usage LEDs"
-        depends on ARCH_CDB89712 || ARCH_CO285 || ARCH_EBSA110 || \
+        depends on ARCH_CDB89712 || ARCH_EBSA110 || \
                    ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \
                    ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
                    ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
@@ -1174,6 +1200,8 @@ source "drivers/dma/Kconfig"
 
 source "drivers/dca/Kconfig"
 
+source "drivers/uio/Kconfig"
+
 endmenu
 
 source "fs/Kconfig"