diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:24 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:24 +0200 |
| commit | 904298deb07d532a76de153a42c6f678d2e4c740 (patch) | |
| tree | 613d135d183962bf4dee1f5aef9449fbaceb0acd /arch/arm/Kconfig | |
| parent | ebf9022f2eee564fc4b0e4b37a8267319923d808 (diff) | |
| parent | fe4ecd1dbfc44d0fe420e8b28a984738d74f3b69 (diff) | |
| download | barebox-904298deb07d532a76de153a42c6f678d2e4c740.tar.gz barebox-904298deb07d532a76de153a42c6f678d2e4c740.tar.xz | |
Merge branch 'for-next/socfpga'
Conflicts:
scripts/Makefile
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 38116becf5..91025d81f9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -117,6 +117,17 @@ config ARCH_PXA bool "Intel/Marvell PXA based" select GENERIC_GPIO +config ARCH_SOCFPGA + bool "Altera SOCFPGA cyclone5" + select HAS_DEBUG_LL + select ARM_SMP_TWD + select CPU_V7 + select COMMON_CLK + select CLKDEV_LOOKUP + select GENERIC_GPIO + select GPIOLIB + select HAVE_PBL_MULTI_IMAGES + config ARCH_S3C24xx bool "Samsung S3C2410, S3C2440" select ARCH_SAMSUNG @@ -183,6 +194,7 @@ source arch/arm/mach-nomadik/Kconfig source arch/arm/mach-omap/Kconfig source arch/arm/mach-pxa/Kconfig source arch/arm/mach-samsung/Kconfig +source arch/arm/mach-socfpga/Kconfig source arch/arm/mach-versatile/Kconfig source arch/arm/mach-vexpress/Kconfig source arch/arm/mach-tegra/Kconfig |