diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-04 21:04:24 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-04 21:04:24 +0200 |
| commit | c9bbafe1dc98a7264f756e84c3c32eb5bebe0218 (patch) | |
| tree | e8c2aa77d01be7dda6ffe42f0c7383ec213e7d75 /arch/arm/configs | |
| parent | b7a7b02af5a5873f274fb5346fc889e76aa84dcf (diff) | |
| parent | ab353f0c4ed5109ed1eafe35e39a76b10ba360b9 (diff) | |
| download | barebox-c9bbafe1dc98a7264f756e84c3c32eb5bebe0218.tar.gz barebox-c9bbafe1dc98a7264f756e84c3c32eb5bebe0218.tar.xz | |
Merge branch 'for-next/samsung'
Conflicts:
arch/arm/configs/friendlyarm_mini2440_defconfig
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/friendlyarm_mini2440_defconfig | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/configs/friendlyarm_mini2440_defconfig b/arch/arm/configs/friendlyarm_mini2440_defconfig index ed110141cb..acd5e42da2 100644 --- a/arch/arm/configs/friendlyarm_mini2440_defconfig +++ b/arch/arm/configs/friendlyarm_mini2440_defconfig @@ -9,9 +9,9 @@ CONFIG_BROKEN=y CONFIG_PROMPT="mini2440:" CONFIG_LONGHELP=y CONFIG_GLOB=y +CONFIG_HUSH_GETOPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/friendlyarm-mini2440/env" CONFIG_DEBUG_INFO=y CONFIG_CMD_EDIT=y @@ -21,8 +21,11 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y +CONFIG_CMD_GLOBAL=y +CONFIG_CMD_TFTP=y CONFIG_CMD_MEMINFO=y -CONFIG_CMD_MTEST=y +CONFIG_CMD_CRC=y +CONFIG_CMD_CRC_CMP=y CONFIG_CMD_FLASH=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y @@ -38,6 +41,6 @@ CONFIG_DRIVER_NET_DM9K=y # CONFIG_SPI is not set CONFIG_USB=y CONFIG_USB_OHCI=y -CONFIG_DRIVER_VIDEO_S3C24XX=y CONFIG_MCI=y CONFIG_MCI_S3C=y +CONFIG_FS_TFTP=y |