diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-11 10:49:34 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-11 10:49:34 +0100 |
| commit | aaad4dad239d59520063c09288480ab215a263f9 (patch) | |
| tree | 34e7a3e4e736f9bb04b7e4463e8deca85ffe69f4 /arch/arm/configs/socfpga_defconfig | |
| parent | e809777b9539405f2e74ea39849c57b1a65a2f02 (diff) | |
| parent | c44669e2b22c5f4616951b5ecd0ff9afdc8a90f3 (diff) | |
| download | barebox-aaad4dad239d59520063c09288480ab215a263f9.tar.gz barebox-aaad4dad239d59520063c09288480ab215a263f9.tar.xz | |
Merge branch 'for-next/arm'
Diffstat (limited to 'arch/arm/configs/socfpga_defconfig')
| -rw-r--r-- | arch/arm/configs/socfpga_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig index 7fbe045e27..6cbc28ea42 100644 --- a/arch/arm/configs/socfpga_defconfig +++ b/arch/arm/configs/socfpga_defconfig @@ -1,6 +1,7 @@ CONFIG_ARCH_SOCFPGA=y CONFIG_MACH_SOCFPGA_EBV_SOCRATES=y CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT=y +CONFIG_MACH_SOCFPGA_TERASIC_DE0_NANO_SOC=y CONFIG_THUMB2_BAREBOX=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y |