diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:36 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:36 +0200 |
| commit | 6e30646fa28908b3f199d070ebb85151fef52a10 (patch) | |
| tree | ad26005307ee7fe7674feeb68cb452091e7188c7 /arch/arm/configs | |
| parent | 904298deb07d532a76de153a42c6f678d2e4c740 (diff) | |
| parent | f93b5f8eb973a62affbaf134f07d367649ed3ae4 (diff) | |
| download | barebox-6e30646fa28908b3f199d070ebb85151fef52a10.tar.gz barebox-6e30646fa28908b3f199d070ebb85151fef52a10.tar.xz | |
Merge branch 'for-next/tegra'
Conflicts:
arch/arm/dts/Makefile
images/Makefile
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/tegra_v7_defconfig (renamed from arch/arm/configs/tegra20_colibri_iris_defconfig) | 11 | ||||
| -rw-r--r-- | arch/arm/configs/toshiba_ac100_defconfig | 42 |
2 files changed, 7 insertions, 46 deletions
diff --git a/arch/arm/configs/tegra20_colibri_iris_defconfig b/arch/arm/configs/tegra_v7_defconfig index 37a0e8ac51..677a955dac 100644 --- a/arch/arm/configs/tegra20_colibri_iris_defconfig +++ b/arch/arm/configs/tegra_v7_defconfig @@ -1,18 +1,21 @@ -CONFIG_BUILTIN_DTB_NAME="tegra20-colibri-iris" CONFIG_ARCH_TEGRA=y +CONFIG_MACH_TORADEX_COLIBRI_T20_IRIS=y +CONFIG_MACH_TOSHIBA_AC100=y CONFIG_AEABI=y CONFIG_CMD_ARM_MMUINFO=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y +CONFIG_ARM_UNWIND=y +CONFIG_MMU=y CONFIG_STACK_SIZE=0x10000 CONFIG_MALLOC_SIZE=0x4000000 CONFIG_LONGHELP=y -CONFIG_GLOB=y -CONFIG_GLOB_SORT=y CONFIG_HUSH_FANCY_PROMPT=y -CONFIG_HUSH_GETOPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y +CONFIG_MENU=y +CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_CMD_EDIT=y +CONFIG_CMD_EXPORT=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_IOMEM=y CONFIG_CMD_BOOTZ=y diff --git a/arch/arm/configs/toshiba_ac100_defconfig b/arch/arm/configs/toshiba_ac100_defconfig deleted file mode 100644 index 19039108a1..0000000000 --- a/arch/arm/configs/toshiba_ac100_defconfig +++ /dev/null @@ -1,42 +0,0 @@ -CONFIG_BUILTIN_DTB_NAME="tegra20-paz00" -CONFIG_ARCH_TEGRA=y -CONFIG_TEGRA_UART_A=y -CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_TEXT_BASE=0x01000000 -CONFIG_BROKEN=y -CONFIG_EXPERIMENTAL=y -CONFIG_PROMPT="toshiba ac100> " -CONFIG_LONGHELP=y -CONFIG_CMDLINE_EDITING=y -CONFIG_AUTO_COMPLETE=y -# CONFIG_ERRNO_MESSAGES is not set -# CONFIG_DEFAULT_ENVIRONMENT is not set -CONFIG_POLLER=y -CONFIG_ENABLE_DEVICE_NOISE=y -CONFIG_CMD_SLEEP=y -# CONFIG_CMD_TRUE is not set -# CONFIG_CMD_FALSE is not set -CONFIG_CMD_TFTP=y -CONFIG_CMD_LOADB=y -CONFIG_CMD_LOADY=y -CONFIG_CMD_LOADS=y -CONFIG_CMD_MEMINFO=y -CONFIG_CMD_MD5SUM=y -CONFIG_CMD_SHA1SUM=y -CONFIG_CMD_BOOTM_SHOW_TYPE=y -CONFIG_CMD_RESET=y -CONFIG_CMD_GO=y -CONFIG_CMD_OFTREE=y -CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y -CONFIG_NET_NETCONSOLE=y -CONFIG_DRIVER_SERIAL_NS16550=y -CONFIG_NET_USB=y -CONFIG_NET_USB_ASIX=y -# CONFIG_SPI is not set -CONFIG_USB=y -CONFIG_USB_EHCI=y -CONFIG_USB_STORAGE=y -CONFIG_FS_TFTP=y -CONFIG_FS_FAT=y |