barebox: update configs

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>

2 files changed, 20 insertions, 153 deletions

diff --git a/barebox.config b/barebox.config
index 6a001c8..718b212 100644
--- a/barebox.config
+++ b/barebox.config
@@ -92,13 +92,13 @@ CONFIG_HAVE_IMAGE_COMPRESSION=y
 # CONFIG_PBL_IMAGE is not set
 CONFIG_MMU=y
 CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
-CONFIG_TEXT_BASE=0x81000000
+CONFIG_TEXT_BASE=0x82000000
 CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
 CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y
 CONFIG_MEMORY_LAYOUT_DEFAULT=y
 # CONFIG_MEMORY_LAYOUT_FIXED is not set
 CONFIG_STACK_SIZE=0x8000
-CONFIG_MALLOC_SIZE=0x400000
+CONFIG_MALLOC_SIZE=0x1000000
 # CONFIG_BROKEN is not set
 # CONFIG_EXPERIMENTAL is not set
 CONFIG_MALLOC_DLMALLOC=y
@@ -265,7 +265,7 @@ CONFIG_CMD_UNCOMPRESS=y
 CONFIG_CMD_MIITOOL=y
 CONFIG_NET=y
 CONFIG_NET_DHCP=y
-# CONFIG_NET_NFS is not set
+CONFIG_NET_NFS=y
 CONFIG_NET_PING=y
 # CONFIG_NET_NETCONSOLE is not set
 CONFIG_NET_RESOLV=y
diff --git a/barebox_mlo.config b/barebox_mlo.config
index 20a02fb..d679765 100644
--- a/barebox_mlo.config
+++ b/barebox_mlo.config
@@ -3,7 +3,6 @@
 # Barebox/arm 2012.12.0 Configuration
 #
 CONFIG_ARM=y
-CONFIG_ARM_LINUX=y
 
 #
 # System Type
@@ -64,24 +63,19 @@ CONFIG_ARM_EXCEPTIONS=y
 CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG"
 CONFIG_HAS_KALLSYMS=y
 CONFIG_HAS_MODULES=y
-CONFIG_CMD_MEMORY=y
-CONFIG_ENV_HANDLING=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_BLOCK=y
+CONFIG_BLOCK_WRITE=y
 CONFIG_HAVE_NOSHELL=y
 CONFIG_FILETYPE=y
-CONFIG_BINFMT=y
-CONFIG_UIMAGE=y
-CONFIG_GLOBALVAR=y
-CONFIG_STDDEV=y
 
 #
 # General Settings
 #
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
-CONFIG_BANNER=y
-CONFIG_MEMINFO=y
+# CONFIG_BANNER is not set
+# CONFIG_MEMINFO is not set
 CONFIG_ENVIRONMENT_VARIABLES=y
 
 #
@@ -105,26 +99,20 @@ CONFIG_MALLOC_SIZE=0x1000000
 # CONFIG_EXPERIMENTAL is not set
 CONFIG_MALLOC_DLMALLOC=y
 # CONFIG_MALLOC_TLSF is not set
+# CONFIG_MALLOC_DUMMY is not set
 # CONFIG_KALLSYMS is not set
-CONFIG_PROMPT="barebox> "
+CONFIG_PROMPT="MLO>"
 CONFIG_BAUDRATE=115200
+CONFIG_SIMPLE_READLINE=y
 # CONFIG_LONGHELP is not set
 CONFIG_CBSIZE=1024
 CONFIG_MAXARGS=16
-CONFIG_SHELL_HUSH=y
+# CONFIG_SHELL_HUSH is not set
 # CONFIG_SHELL_SIMPLE is not set
-# CONFIG_SHELL_NONE is not set
-CONFIG_GLOB=y
-CONFIG_GLOB_SORT=y
-CONFIG_PROMPT_HUSH_PS2="> "
-CONFIG_HUSH_FANCY_PROMPT=y
-CONFIG_HUSH_GETOPT=y
-CONFIG_CMDLINE_EDITING=y
-CONFIG_AUTO_COMPLETE=y
-# CONFIG_MENU is not set
+CONFIG_SHELL_NONE=y
+# CONFIG_CMDLINE_EDITING is not set
 # CONFIG_PASSWORD is not set
-CONFIG_DYNAMIC_CRC_TABLE=y
-CONFIG_ERRNO_MESSAGES=y
+# CONFIG_ERRNO_MESSAGES is not set
 # CONFIG_TIMESTAMP is not set
 CONFIG_CONSOLE_FULL=y
 CONFIG_CONSOLE_ACTIVATE_FIRST=y
@@ -133,13 +121,9 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 CONFIG_PARTITION=y
 CONFIG_PARTITION_DISK=y
 CONFIG_PARTITION_DISK_DOS=y
-CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
-# CONFIG_DEFAULT_ENVIRONMENT_GENERIC is not set
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/beaglebone/env"
-CONFIG_BAREBOXENV_TARGET=y
+# CONFIG_DEFAULT_ENVIRONMENT is not set
+# CONFIG_BAREBOXENV_TARGET is not set
 # CONFIG_POLLER is not set
-# CONFIG_RESET_SOURCE is not set
 
 #
 # Debugging
@@ -150,116 +134,7 @@ CONFIG_BAREBOXENV_TARGET=y
 # CONFIG_ENABLE_DEVICE_NOISE is not set
 # CONFIG_DEBUG_LL is not set
 CONFIG_HAS_DEBUG_LL=y
-CONFIG_COMMAND_SUPPORT=y
 # CONFIG_HAS_POWEROFF is not set
-
-#
-# commands
-#
-
-#
-# scripting
-#
-CONFIG_CMD_EDIT=y
-CONFIG_CMD_SLEEP=y
-# CONFIG_CMD_MSLEEP is not set
-# CONFIG_CMD_SAVEENV is not set
-CONFIG_CMD_LOADENV=y
-CONFIG_CMD_EXPORT=y
-CONFIG_CMD_PRINTENV=y
-CONFIG_CMD_READLINE=y
-CONFIG_CMD_TRUE=y
-CONFIG_CMD_FALSE=y
-# CONFIG_CMD_LOGIN is not set
-# CONFIG_CMD_PASSWD is not set
-# CONFIG_CMD_TIME is not set
-CONFIG_CMD_GLOBAL=y
-
-#
-# file commands
-#
-CONFIG_CMD_LS=y
-CONFIG_CMD_RM=y
-CONFIG_CMD_CAT=y
-CONFIG_CMD_MKDIR=y
-CONFIG_CMD_RMDIR=y
-CONFIG_CMD_CP=y
-CONFIG_CMD_PWD=y
-CONFIG_CMD_CD=y
-CONFIG_CMD_MOUNT=y
-# CONFIG_CMD_UMOUNT is not set
-CONFIG_CMD_AUTOMOUNT=y
-CONFIG_CMD_BASENAME=y
-# CONFIG_CMD_DIRNAME is not set
-# CONFIG_CMD_LN is not set
-# CONFIG_CMD_READLINK is not set
-# CONFIG_CMD_FILETYPE is not set
-
-#
-# console
-#
-# CONFIG_CMD_CLEAR is not set
-CONFIG_CMD_ECHO=y
-CONFIG_CMD_ECHO_E=y
-
-#
-# memory
-#
-# CONFIG_CMD_LOADB is not set
-# CONFIG_CMD_LOADY is not set
-# CONFIG_CMD_LOADS is not set
-# CONFIG_CMD_MEMINFO is not set
-CONFIG_CMD_IOMEM=y
-CONFIG_CMD_CRC=y
-CONFIG_CMD_CRC_CMP=y
-# CONFIG_CMD_MD5SUM is not set
-# CONFIG_CMD_SHA1SUM is not set
-# CONFIG_CMD_SHA256SUM is not set
-# CONFIG_CMD_SHA224SUM is not set
-
-#
-# flash
-#
-# CONFIG_CMD_FLASH is not set
-
-#
-# booting
-#
-CONFIG_CMD_BOOTM=y
-CONFIG_CMD_BOOTM_SHOW_TYPE=y
-CONFIG_CMD_BOOTM_VERBOSE=y
-CONFIG_CMD_BOOTM_INITRD=y
-CONFIG_CMD_BOOTM_OFTREE=y
-CONFIG_CMD_BOOTM_OFTREE_UIMAGE=y
-# CONFIG_CMD_BOOTM_AIMAGE is not set
-# CONFIG_CMD_UIMAGE is not set
-# CONFIG_CMD_BOOTZ is not set
-# CONFIG_CMD_BOOTU is not set
-CONFIG_FLEXIBLE_BOOTARGS=y
-CONFIG_CMD_RESET=y
-CONFIG_CMD_GO=y
-CONFIG_CMD_OFTREE=y
-# CONFIG_CMD_OFTREE_PROBE is not set
-
-#
-# testing
-#
-# CONFIG_CMD_MTEST is not set
-
-#
-# video command
-#
-# CONFIG_CMD_BAREBOX_UPDATE is not set
-CONFIG_CMD_TIMEOUT=y
-# CONFIG_CMD_PARTITION is not set
-CONFIG_CMD_TEST=y
-# CONFIG_CMD_VERSION is not set
-CONFIG_CMD_HELP=y
-CONFIG_CMD_MAGICVAR=y
-CONFIG_CMD_MAGICVAR_HELP=y
-CONFIG_CMD_DEVINFO=y
-# CONFIG_CMD_GPIO is not set
-# CONFIG_CMD_UNCOMPRESS is not set
 # CONFIG_NET is not set
 
 #
@@ -285,7 +160,7 @@ CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
 # CONFIG_DRIVER_CFI is not set
 # CONFIG_MTD is not set
 CONFIG_DISK=y
-# CONFIG_DISK_WRITE is not set
+CONFIG_DISK_WRITE=y
 
 #
 # drive types
@@ -305,8 +180,7 @@ CONFIG_MCI=y
 # --- Feature list ---
 #
 CONFIG_MCI_STARTUP=y
-# CONFIG_MCI_INFO is not set
-# CONFIG_MCI_WRITE is not set
+CONFIG_MCI_WRITE=y
 
 #
 # --- MCI host drivers ---
@@ -344,11 +218,10 @@ CONFIG_GPIOLIB=y
 # Filesystem support
 #
 CONFIG_FS=y
-CONFIG_FS_AUTOMOUNT=y
 # CONFIG_FS_CRAMFS is not set
 # CONFIG_FS_EXT4 is not set
-CONFIG_FS_RAMFS=y
-CONFIG_FS_DEVFS=y
+# CONFIG_FS_RAMFS is not set
+# CONFIG_FS_DEVFS is not set
 CONFIG_FS_FAT=y
 # CONFIG_FS_FAT_WRITE is not set
 CONFIG_FS_FAT_LFN=y
@@ -356,19 +229,13 @@ CONFIG_FS_FAT_LFN=y
 #
 # Library routines
 #
-CONFIG_PARAMETER=y
-CONFIG_UNCOMPRESS=y
 # CONFIG_ZLIB is not set
 # CONFIG_BZLIB is not set
 # CONFIG_GENERIC_FIND_NEXT_BIT is not set
-CONFIG_PROCESS_ESCAPE_SEQUENCE=y
+# CONFIG_PROCESS_ESCAPE_SEQUENCE is not set
 # CONFIG_LZO_DECOMPRESS is not set
-CONFIG_FDT=y
-CONFIG_OFTREE=y
-CONFIG_QSORT=y
 
 #
 # Library gui routines
 #
-CONFIG_CRC32=y
 # CONFIG_DIGEST is not set