Merge branch 'for-rmk' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel

[linux-2.6-omap-h63xx.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5021db2217eddfbecd628aba53ca44f6fb62ade9..4f870207f496617a4b2cd480f5667ae5ddab2c61 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -16,8 +16,7 @@ config ARM
        select HAVE_ARCH_KGDB
        select HAVE_KPROBES if (!XIP_KERNEL)
        select HAVE_KRETPROBES if (HAVE_KPROBES)
        select HAVE_ARCH_KGDB
        select HAVE_KPROBES if (!XIP_KERNEL)
        select HAVE_KRETPROBES if (HAVE_KPROBES)

-       select HAVE_FTRACE if (!XIP_KERNEL)
-       select HAVE_DYNAMIC_FTRACE if (HAVE_FTRACE)
+       select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)

        select HAVE_GENERIC_DMA_COHERENT
        help
          The ARM series is a line of low-power-consumption RISC chip designs
        select HAVE_GENERIC_DMA_COHERENT
        help
          The ARM series is a line of low-power-consumption RISC chip designs


@@ -157,7 +156,6 @@ config ARCH_MTD_XIP
        bool
 
 config GENERIC_HARDIRQS_NO__DO_IRQ
        bool
 
 config GENERIC_HARDIRQS_NO__DO_IRQ

-       bool

        def_bool y
 
 if OPROFILE
        def_bool y
 
 if OPROFILE


@@ -202,6 +200,7 @@ choice
 
 config ARCH_AAEC2000
        bool "Agilent AAEC-2000 based"
 
 config ARCH_AAEC2000
        bool "Agilent AAEC-2000 based"

+       select CPU_ARM920T

        select ARM_AMBA
        select HAVE_CLK
        help
        select ARM_AMBA
        select HAVE_CLK
        help


@@ -211,6 +210,7 @@ config ARCH_INTEGRATOR
        bool "ARM Ltd. Integrator family"
        select ARM_AMBA
        select HAVE_CLK
        bool "ARM Ltd. Integrator family"
        select ARM_AMBA
        select HAVE_CLK

+       select COMMON_CLKDEV

        select ICST525
        help
          Support for ARM's Integrator platform.
        select ICST525
        help
          Support for ARM's Integrator platform.


@@ -219,6 +219,7 @@ config ARCH_REALVIEW
        bool "ARM Ltd. RealView family"
        select ARM_AMBA
        select HAVE_CLK
        bool "ARM Ltd. RealView family"
        select ARM_AMBA
        select HAVE_CLK

+       select COMMON_CLKDEV

        select ICST307
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select ICST307
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS


@@ -230,6 +231,7 @@ config ARCH_VERSATILE
        select ARM_AMBA
        select ARM_VIC
        select HAVE_CLK
        select ARM_AMBA
        select ARM_VIC
        select HAVE_CLK

+       select COMMON_CLKDEV

        select ICST307
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select ICST307
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS


@@ -244,22 +246,15 @@ config ARCH_AT91
          This enables support for systems based on the Atmel AT91RM9200,
          AT91SAM9 and AT91CAP9 processors.
 
          This enables support for systems based on the Atmel AT91RM9200,
          AT91SAM9 and AT91CAP9 processors.
 

-config ARCH_CLPS7500
-       bool "Cirrus CL-PS7500FE"
-       select TIMER_ACORN
-       select ISA
-       select NO_IOPORT
-       select ARCH_SPARSEMEM_ENABLE
-       help
-         Support for the Cirrus Logic PS7500FE system-on-a-chip.
-

 config ARCH_CLPS711X
        bool "Cirrus Logic CLPS711x/EP721x-based"
 config ARCH_CLPS711X
        bool "Cirrus Logic CLPS711x/EP721x-based"

+       select CPU_ARM720T

        help
          Support for Cirrus Logic 711x/721x based boards.
 
 config ARCH_EBSA110
        bool "EBSA-110"
        help
          Support for Cirrus Logic 711x/721x based boards.
 
 config ARCH_EBSA110
        bool "EBSA-110"

+       select CPU_SA110

        select ISA
        select NO_IOPORT
        help
        select ISA
        select NO_IOPORT
        help


@@ -270,16 +265,19 @@ config ARCH_EBSA110
 
 config ARCH_EP93XX
        bool "EP93xx-based"
 
 config ARCH_EP93XX
        bool "EP93xx-based"

+       select CPU_ARM920T

        select ARM_AMBA
        select ARM_VIC
        select GENERIC_GPIO
        select HAVE_CLK
        select ARM_AMBA
        select ARM_VIC
        select GENERIC_GPIO
        select HAVE_CLK

+       select COMMON_CLKDEV

        select ARCH_REQUIRE_GPIOLIB
        help
          This enables support for the Cirrus EP93xx series of CPUs.
 
 config ARCH_FOOTBRIDGE
        bool "FootBridge"
        select ARCH_REQUIRE_GPIOLIB
        help
          This enables support for the Cirrus EP93xx series of CPUs.
 
 config ARCH_FOOTBRIDGE
        bool "FootBridge"

+       select CPU_SA110

        select FOOTBRIDGE
        help
          Support for systems based on the DC21285 companion chip
        select FOOTBRIDGE
        help
          Support for systems based on the DC21285 companion chip


@@ -287,18 +285,23 @@ config ARCH_FOOTBRIDGE
 
 config ARCH_NETX
        bool "Hilscher NetX based"
 
 config ARCH_NETX
        bool "Hilscher NetX based"

+       select CPU_ARM926T

        select ARM_VIC
        select ARM_VIC

+       select GENERIC_CLOCKEVENTS
+       select GENERIC_TIME

        help
          This enables support for systems based on the Hilscher NetX Soc
 
 config ARCH_H720X
        bool "Hynix HMS720x-based"
        help
          This enables support for systems based on the Hilscher NetX Soc
 
 config ARCH_H720X
        bool "Hynix HMS720x-based"

+       select CPU_ARM720T

        select ISA_DMA_API
        help
          This enables support for systems based on the Hynix HMS720x
 
 config ARCH_IMX
        bool "IMX"
        select ISA_DMA_API
        help
          This enables support for systems based on the Hynix HMS720x
 
 config ARCH_IMX
        bool "IMX"

+       select CPU_ARM920T

        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS


@@ -308,6 +311,7 @@ config ARCH_IMX
 config ARCH_IOP13XX
        bool "IOP13xx-based"
        depends on MMU
 config ARCH_IOP13XX
        bool "IOP13xx-based"
        depends on MMU

+       select CPU_XSC3

        select PLAT_IOP
        select PCI
        select ARCH_SUPPORTS_MSI
        select PLAT_IOP
        select PCI
        select ARCH_SUPPORTS_MSI


@@ -318,6 +322,7 @@ config ARCH_IOP13XX
 config ARCH_IOP32X
        bool "IOP32x-based"
        depends on MMU
 config ARCH_IOP32X
        bool "IOP32x-based"
        depends on MMU

+       select CPU_XSCALE

        select PLAT_IOP
        select PCI
        select GENERIC_GPIO
        select PLAT_IOP
        select PCI
        select GENERIC_GPIO


@@ -329,6 +334,7 @@ config ARCH_IOP32X
 config ARCH_IOP33X
        bool "IOP33x-based"
        depends on MMU
 config ARCH_IOP33X
        bool "IOP33x-based"
        depends on MMU

+       select CPU_XSCALE

        select PLAT_IOP
        select PCI
        select GENERIC_GPIO
        select PLAT_IOP
        select PCI
        select GENERIC_GPIO


@@ -339,6 +345,7 @@ config ARCH_IOP33X
 config ARCH_IXP23XX
        bool "IXP23XX-based"
        depends on MMU
 config ARCH_IXP23XX
        bool "IXP23XX-based"
        depends on MMU

+       select CPU_XSC3

        select PCI
        help
          Support for Intel's IXP23xx (XScale) family of processors.
        select PCI
        help
          Support for Intel's IXP23xx (XScale) family of processors.


@@ -346,6 +353,7 @@ config ARCH_IXP23XX
 config ARCH_IXP2000
        bool "IXP2400/2800-based"
        depends on MMU
 config ARCH_IXP2000
        bool "IXP2400/2800-based"
        depends on MMU

+       select CPU_XSCALE

        select PCI
        help
          Support for Intel's IXP2400/2800 (XScale) family of processors.
        select PCI
        help
          Support for Intel's IXP2400/2800 (XScale) family of processors.


@@ -353,6 +361,7 @@ config ARCH_IXP2000
 config ARCH_IXP4XX
        bool "IXP4xx-based"
        depends on MMU
 config ARCH_IXP4XX
        bool "IXP4xx-based"
        depends on MMU

+       select CPU_XSCALE

        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS


@@ -362,6 +371,7 @@ config ARCH_IXP4XX
 
 config ARCH_L7200
        bool "LinkUp-L7200"
 
 config ARCH_L7200
        bool "LinkUp-L7200"

+       select CPU_ARM720T

        select FIQ
        help
          Say Y here if you intend to run this kernel on a LinkUp Systems
        select FIQ
        help
          Say Y here if you intend to run this kernel on a LinkUp Systems


@@ -375,6 +385,7 @@ config ARCH_L7200
 
 config ARCH_KIRKWOOD
        bool "Marvell Kirkwood"
 
 config ARCH_KIRKWOOD
        bool "Marvell Kirkwood"

+       select CPU_FEROCEON

        select PCI
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select PCI
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS


@@ -385,13 +396,16 @@ config ARCH_KIRKWOOD
 
 config ARCH_KS8695
        bool "Micrel/Kendin KS8695"
 
 config ARCH_KS8695
        bool "Micrel/Kendin KS8695"

+       select CPU_ARM922T

        select GENERIC_GPIO
        select GENERIC_GPIO

+        select ARCH_REQUIRE_GPIOLIB

        help
          Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
          System-on-Chip devices.
 
 config ARCH_NS9XXX
        bool "NetSilicon NS9xxx"
        help
          Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
          System-on-Chip devices.
 
 config ARCH_NS9XXX
        bool "NetSilicon NS9xxx"

+       select CPU_ARM926T

        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS


@@ -404,6 +418,7 @@ config ARCH_NS9XXX
 
 config ARCH_LOKI
        bool "Marvell Loki (88RC8480)"
 
 config ARCH_LOKI
        bool "Marvell Loki (88RC8480)"

+       select CPU_FEROCEON

        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select PLAT_ORION
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select PLAT_ORION


@@ -412,6 +427,7 @@ config ARCH_LOKI
 
 config ARCH_MV78XX0
        bool "Marvell MV78xx0"
 
 config ARCH_MV78XX0
        bool "Marvell MV78xx0"

+       select CPU_FEROCEON

        select PCI
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select PCI
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS


@@ -433,6 +449,7 @@ config ARCH_MXC
 config ARCH_ORION5X
        bool "Marvell Orion"
        depends on MMU
 config ARCH_ORION5X
        bool "Marvell Orion"
        depends on MMU

+       select CPU_FEROCEON

        select PCI
        select GENERIC_GPIO
        select GENERIC_TIME
        select PCI
        select GENERIC_GPIO
        select GENERIC_TIME


@@ -445,6 +462,7 @@ config ARCH_ORION5X
 
 config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"
 
 config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"

+       select CPU_ARM926T

        select HAVE_CLK
        help
          This enables support for Philips PNX4008 mobile platform.
        select HAVE_CLK
        help
          This enables support for Philips PNX4008 mobile platform.


@@ -455,6 +473,7 @@ config ARCH_PXA
        select ARCH_MTD_XIP
        select GENERIC_GPIO
        select HAVE_CLK
        select ARCH_MTD_XIP
        select GENERIC_GPIO
        select HAVE_CLK

+       select COMMON_CLKDEV

        select ARCH_REQUIRE_GPIOLIB
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select ARCH_REQUIRE_GPIOLIB
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS


@@ -478,6 +497,7 @@ config ARCH_RPC
 
 config ARCH_SA1100
        bool "SA1100-based"
 
 config ARCH_SA1100
        bool "SA1100-based"

+       select CPU_SA1100

        select ISA
        select ARCH_SPARSEMEM_ENABLE
        select ARCH_MTD_XIP
        select ISA
        select ARCH_SPARSEMEM_ENABLE
        select ARCH_MTD_XIP


@@ -499,8 +519,16 @@ config ARCH_S3C2410
          BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
          the Samsung SMDK2410 development board (and derivatives).
 
          BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
          the Samsung SMDK2410 development board (and derivatives).
 

+config ARCH_S3C64XX
+       bool "Samsung S3C64XX"
+       select GENERIC_GPIO
+       select HAVE_CLK
+       help
+         Samsung S3C64XX series based systems
+

 config ARCH_SHARK
        bool "Shark"
 config ARCH_SHARK
        bool "Shark"

+       select CPU_SA110

        select ISA
        select ISA_DMA
        select ZONE_DMA
        select ISA
        select ISA_DMA
        select ZONE_DMA


@@ -511,6 +539,7 @@ config ARCH_SHARK
 
 config ARCH_LH7A40X
        bool "Sharp LH7A40X"
 
 config ARCH_LH7A40X
        bool "Sharp LH7A40X"

+       select CPU_ARM922T

        select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM
        select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM
        help
        select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM
        select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM
        help


@@ -521,6 +550,7 @@ config ARCH_LH7A40X
 
 config ARCH_DAVINCI
        bool "TI DaVinci"
 
 config ARCH_DAVINCI
        bool "TI DaVinci"

+       select CPU_ARM926T

        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select GENERIC_GPIO


@@ -542,6 +572,7 @@ config ARCH_OMAP
 
 config ARCH_MSM
        bool "Qualcomm MSM"
 
 config ARCH_MSM
        bool "Qualcomm MSM"

+       select CPU_V6

        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        help
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        help


@@ -550,6 +581,13 @@ config ARCH_MSM
          interface to the ARM9 modem processor which runs the baseband stack
          and controls some vital subsystems (clock and power control, etc).
 
          interface to the ARM9 modem processor which runs the baseband stack
          and controls some vital subsystems (clock and power control, etc).
 

+config ARCH_W90X900
+       bool "Nuvoton W90X900 CPU"
+       select CPU_ARM926T
+       help
+               Support for Nuvoton (Winbond logic dept.) ARM9 processor,You
+               can login www.mcuos.com or www.nuvoton.com to know more.
+

 endchoice
 
 source "arch/arm/mach-clps711x/Kconfig"
 endchoice
 
 source "arch/arm/mach-clps711x/Kconfig"


@@ -591,6 +629,7 @@ source "arch/arm/mach-orion5x/Kconfig"
 source "arch/arm/mach-kirkwood/Kconfig"
 
 source "arch/arm/plat-s3c24xx/Kconfig"
 source "arch/arm/mach-kirkwood/Kconfig"
 
 source "arch/arm/plat-s3c24xx/Kconfig"

+source "arch/arm/plat-s3c64xx/Kconfig"

 source "arch/arm/plat-s3c/Kconfig"
 
 if ARCH_S3C2410
 source "arch/arm/plat-s3c/Kconfig"
 
 if ARCH_S3C2410


@@ -602,6 +641,11 @@ source "arch/arm/mach-s3c2442/Kconfig"
 source "arch/arm/mach-s3c2443/Kconfig"
 endif
 
 source "arch/arm/mach-s3c2443/Kconfig"
 endif
 

+if ARCH_S3C64XX
+source "arch/arm/mach-s3c6400/Kconfig"
+source "arch/arm/mach-s3c6410/Kconfig"
+endif
+

 source "arch/arm/mach-lh7a40x/Kconfig"
 
 source "arch/arm/mach-imx/Kconfig"
 source "arch/arm/mach-lh7a40x/Kconfig"
 
 source "arch/arm/mach-imx/Kconfig"


@@ -628,6 +672,8 @@ source "arch/arm/mach-ks8695/Kconfig"
 
 source "arch/arm/mach-msm/Kconfig"
 
 
 source "arch/arm/mach-msm/Kconfig"
 

+source "arch/arm/mach-w90x900/Kconfig"
+

 # Definitions to make life easier
 config ARCH_ACORN
        bool
 # Definitions to make life easier
 config ARCH_ACORN
        bool


@@ -782,7 +828,7 @@ config HOTPLUG_CPU
 
 config LOCAL_TIMERS
        bool "Use local timer interrupts"
 
 config LOCAL_TIMERS
        bool "Use local timer interrupts"

-       depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP)
+       depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || REALVIEW_EB_A9MP)

        default y
        help
          Enable support for local timers on SMP platforms, rather then the
        default y
        help
          Enable support for local timers on SMP platforms, rather then the