diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-05-05 11:31:44 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-05-05 11:31:44 +0200 |
| commit | 5485383d60cd62f1306c5ba6b781e684ba5c2ec3 (patch) | |
| tree | a10523f97dbbfccb1b4a45e55a915831157394d9 /arch/arm/Kconfig | |
| parent | 8e91536a000c1738e354827d6f72965fa1444985 (diff) | |
| parent | 243530107ad99daa9456e8843efef25326d2a613 (diff) | |
| download | barebox-5485383d60cd62f1306c5ba6b781e684ba5c2ec3.tar.gz barebox-5485383d60cd62f1306c5ba6b781e684ba5c2ec3.tar.xz | |
Merge branch 'for-next/socfpga'
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2583e9dd1b..e7edc2ad44 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -169,7 +169,7 @@ config ARCH_ROCKCHIP select ARCH_HAS_L2X0 config ARCH_SOCFPGA - bool "Altera SOCFPGA cyclone5" + bool "Altera SOCFPGA" select HAS_DEBUG_LL select ARM_SMP_TWD select CPU_V7 @@ -177,8 +177,8 @@ config ARCH_SOCFPGA select CLKDEV_LOOKUP select GPIOLIB select HAVE_PBL_MULTI_IMAGES - select OFDEVICE if !ARCH_SOCFPGA_XLOAD - select OFTREE if !ARCH_SOCFPGA_XLOAD + select OFDEVICE if !(ARCH_SOCFPGA_XLOAD && ARCH_SOCFPGA_CYCLONE5) + select OFTREE if !(ARCH_SOCFPGA_XLOAD && ARCH_SOCFPGA_CYCLONE5) config ARCH_S3C24xx bool "Samsung S3C2410, S3C2440" |