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 | |
| 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')
| -rw-r--r-- | arch/arm/configs/socfpga-xload-2_defconfig | 28 | ||||
| -rw-r--r-- | arch/arm/configs/socfpga-xload_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/socfpga_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/tegra_v7_defconfig | 2 |
4 files changed, 30 insertions, 3 deletions
diff --git a/arch/arm/configs/socfpga-xload-2_defconfig b/arch/arm/configs/socfpga-xload-2_defconfig new file mode 100644 index 0000000000..97997cf752 --- /dev/null +++ b/arch/arm/configs/socfpga-xload-2_defconfig @@ -0,0 +1,28 @@ +CONFIG_ARCH_SOCFPGA=y +CONFIG_ARCH_SOCFPGA_XLOAD=y +CONFIG_MACH_SOCFPGA_ALTERA_SOCDK=y +CONFIG_MACH_SOCFPGA_TERASIC_DE0_NANO_SOC=y +CONFIG_THUMB2_BAREBOX=y +CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y +# CONFIG_ARM_EXCEPTIONS is not set +# CONFIG_MEMINFO is not set +CONFIG_MMU=y +CONFIG_MALLOC_SIZE=0x0 +CONFIG_MALLOC_DUMMY=y +CONFIG_RELOCATABLE=y +CONFIG_SHELL_NONE=y +# CONFIG_ERRNO_MESSAGES is not set +# CONFIG_TIMESTAMP is not set +# CONFIG_DEFAULT_ENVIRONMENT is not set +CONFIG_DRIVER_SERIAL_NS16550=y +CONFIG_MCI=y +CONFIG_MCI_STARTUP=y +# CONFIG_MCI_WRITE is not set +CONFIG_MCI_DW=y +CONFIG_MFD_MC13XXX=y +CONFIG_EEPROM_AT25=y +# CONFIG_FS_RAMFS is not set +# CONFIG_FS_DEVFS is not set +CONFIG_FS_FAT=y +CONFIG_BOOTSTRAP=y +CONFIG_BOOTSTRAP_DISK=y diff --git a/arch/arm/configs/socfpga-xload_defconfig b/arch/arm/configs/socfpga-xload_defconfig index 9f64adfd74..521f3f1c1f 100644 --- a/arch/arm/configs/socfpga-xload_defconfig +++ b/arch/arm/configs/socfpga-xload_defconfig @@ -3,12 +3,10 @@ CONFIG_ARCH_SOCFPGA_XLOAD=y CONFIG_MACH_SOCFPGA_EBV_SOCRATES=y CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT=y CONFIG_THUMB2_BAREBOX=y -# CONFIG_CMD_ARM_CPUINFO is not set CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y # CONFIG_ARM_EXCEPTIONS is not set # CONFIG_MEMINFO is not set CONFIG_MMU=y -CONFIG_TEXT_BASE=0x0 CONFIG_MALLOC_SIZE=0x0 CONFIG_MALLOC_DUMMY=y CONFIG_RELOCATABLE=y 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 diff --git a/arch/arm/configs/tegra_v7_defconfig b/arch/arm/configs/tegra_v7_defconfig index c7b59ac1d0..ff92c392cb 100644 --- a/arch/arm/configs/tegra_v7_defconfig +++ b/arch/arm/configs/tegra_v7_defconfig @@ -8,7 +8,7 @@ CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y CONFIG_MMU=y CONFIG_STACK_SIZE=0x10000 -CONFIG_MALLOC_SIZE=0x4000000 +CONFIG_MALLOC_SIZE=0x0 CONFIG_KALLSYMS=y CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y |