diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-05 04:05:19 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-05 04:05:19 (GMT) |
| commit | 242521e90e3f0a7660699761f7b42f0deaa8ea15 (patch) | |
| tree | 14078c1cf39a7506b9f760018181c2b67ffa7f44 /arch/arm/Kconfig | |
| parent | 3fbb96d275989c604b343b9e39aeea50386756e9 (diff) | |
| parent | c1e3c1196be37acaea95803043bc1055ea5131ac (diff) | |
| download | linux-fsl-qoriq-242521e90e3f0a7660699761f7b42f0deaa8ea15.tar.xz | |
Merge branch 'marco-prepare' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/cleanup
* 'marco-prepare' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel:
ARM: SIRF: make sirf irqchip driver optional since new SoCs will have GIC
ARM: PRIMA2: adjust Kconfig to support select SoC features
ARM: PRIMA2: use DT_MACHINE_START and convert to generic board
clk: prima2: move from arch/arm/mach to drivers/clk
ARM: PRIMA2: convert to common clk and finish full clk tree
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 24d955c..5f69285 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -405,21 +405,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 +config ARCH_SIRF + bool "CSR SiRF" select NO_IOPORT select ARCH_REQUIRE_GPIOLIB select GENERIC_CLOCKEVENTS - select CLKDEV_LOOKUP + select COMMON_CLK select GENERIC_IRQ_CHIP select MIGHT_HAVE_CACHE_L2X0 select PINCTRL select PINCTRL_SIRF select USE_OF - select ZONE_DMA help - Support for CSR SiRFSoC ARM Cortex A9 Platform + Support for CSR SiRFprimaII/Marco/Polo platforms config ARCH_EBSA110 bool "EBSA-110" @@ -1108,6 +1106,8 @@ source "arch/arm/mach-exynos/Kconfig" source "arch/arm/mach-shmobile/Kconfig" +source "arch/arm/mach-prima2/Kconfig" + source "arch/arm/mach-tegra/Kconfig" source "arch/arm/mach-u300/Kconfig" |