diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-10-10 08:31:06 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-10-10 08:31:06 +0200 |
| commit | db9c78d57949cdd4c2c019eba9bd193c3171eb4d (patch) | |
| tree | 79234eed17e54e07d38214b0186e05f775f220d9 /arch/arm/mach-socfpga | |
| parent | c80ba33cbe1eb2331a0544d0f553d73e091bb322 (diff) | |
| parent | 790980bf18af13f5d72a31b49febd7086cf307af (diff) | |
| download | barebox-db9c78d57949cdd4c2c019eba9bd193c3171eb4d.tar.gz barebox-db9c78d57949cdd4c2c019eba9bd193c3171eb4d.tar.xz | |
Merge branch 'for-next/defenv'
Diffstat (limited to 'arch/arm/mach-socfpga')
| -rw-r--r-- | arch/arm/mach-socfpga/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig index 94689e3ecd..04b5416b64 100644 --- a/arch/arm/mach-socfpga/Kconfig +++ b/arch/arm/mach-socfpga/Kconfig @@ -13,19 +13,15 @@ config ARCH_TEXT_BASE default 0x00100000 if MACH_SOCFPGA_CYCLONE5 config MACH_SOCFPGA_ALTERA_SOCDK - select HAVE_DEFAULT_ENVIRONMENT_NEW bool "Altera SoCFPGA Development Kit" config MACH_SOCFPGA_EBV_SOCRATES - select HAVE_DEFAULT_ENVIRONMENT_NEW bool "EBV Socrates" config MACH_SOCFPGA_TERASIC_DE0_NANO_SOC - select HAVE_DEFAULT_ENVIRONMENT_NEW bool "Terasic DE0-NANO-SoC aka Atlas" config MACH_SOCFPGA_TERASIC_SOCKIT - select HAVE_DEFAULT_ENVIRONMENT_NEW bool "Terasic SoCKit" endif |