diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:52:55 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:52:55 +0200 |
| commit | 306df04e330bfa0f96bc49fc16db32084fa960f5 (patch) | |
| tree | d312d0a0852f8c5c47084b3c4e1e74c99812ffd0 /arch/arm/Kconfig | |
| parent | 7fbabb52554c6916ce02599f73915576b9329559 (diff) | |
| parent | 6c59c115b0f295434cc4f917d180fecd84d39f81 (diff) | |
Merge branch 'next/soc' into for-next
Conflicts:
arch/arm/mach-omap2/cm-regbits-44xx.h
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c1795c952bf..d290703a687 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -337,6 +337,19 @@ config ARCH_GEMINI help Support for the Cortina Systems Gemini family SoCs +config ARCH_PRIMA2 + bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" + select CPU_V7 + select GENERIC_TIME + select NO_IOPORT + select GENERIC_CLOCKEVENTS + select CLKDEV_LOOKUP + select GENERIC_IRQ_CHIP + select USE_OF + select ZONE_DMA + help + Support for CSR SiRFSoC ARM Cortex A9 Platform + config ARCH_EBSA110 bool "EBSA-110" select CPU_SA110 @@ -880,6 +893,19 @@ config ARCH_VT8500 select HAVE_PWM help Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip. + +config ARCH_ZYNQ + bool "Xilinx Zynq ARM Cortex A9 Platform" + select CPU_V7 + select GENERIC_TIME + select GENERIC_CLOCKEVENTS + select CLKDEV_LOOKUP + select ARM_GIC + select ARM_AMBA + select ICST + select USE_OF + help + Support for Xilinx Zynq ARM Cortex A9 Platform endchoice # |