diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-06-17 08:29:09 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-06-17 08:29:09 +0200 |
| commit | f7c02aea7b45474126b4723dfeb2581b0fd55447 (patch) | |
| tree | 891c5d2c71f0c00bbe35235d0e1a8158e567a019 /arch/arm/configs | |
| parent | a81786a053ed1f08aab8d70d28dbf33691ab7a37 (diff) | |
| parent | c5de3fdcce291a9049a03f86f0553032f5068916 (diff) | |
| download | barebox-f7c02aea7b45474126b4723dfeb2581b0fd55447.tar.gz barebox-f7c02aea7b45474126b4723dfeb2581b0fd55447.tar.xz | |
Merge branch 'net' into next
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/eukrea_cpuimx25_defconfig | 23 | ||||
| -rw-r--r-- | arch/arm/configs/eukrea_cpuimx27_defconfig | 2 |
2 files changed, 16 insertions, 9 deletions
diff --git a/arch/arm/configs/eukrea_cpuimx25_defconfig b/arch/arm/configs/eukrea_cpuimx25_defconfig index 81f9c80a3c..574d32292d 100644 --- a/arch/arm/configs/eukrea_cpuimx25_defconfig +++ b/arch/arm/configs/eukrea_cpuimx25_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# barebox version: 2010.03.0 -# Fri Mar 19 11:12:11 2010 +# barebox version: 2010.05.0 +# Wed Jun 2 01:04:00 2010 # # CONFIG_BOARD_LINKER_SCRIPT is not set CONFIG_GENERIC_LINKER_SCRIPT=y @@ -88,19 +88,20 @@ CONFIG_MALLOC_SIZE=0x1000000 # CONFIG_EXPERIMENTAL is not set CONFIG_MACH_HAS_LOWLEVEL_INIT=y CONFIG_MACH_DO_LOWLEVEL_INIT=y -CONFIG_PROMPT="barebox:" +CONFIG_PROMPT="cpuimx25:" CONFIG_BAUDRATE=115200 -# CONFIG_LONGHELP is not set +CONFIG_LONGHELP=y CONFIG_CBSIZE=1024 CONFIG_MAXARGS=16 CONFIG_SHELL_HUSH=y # CONFIG_SHELL_SIMPLE is not set CONFIG_GLOB=y CONFIG_PROMPT_HUSH_PS2="cpuimx25>" +CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_DYNAMIC_CRC_TABLE=y -# CONFIG_ERRNO_MESSAGES is not set +CONFIG_ERRNO_MESSAGES=y CONFIG_TIMESTAMP=y CONFIG_CONSOLE_FULL=y CONFIG_CONSOLE_ACTIVATE_FIRST=y @@ -153,6 +154,7 @@ CONFIG_CMD_UMOUNT=y # CONFIG_CMD_CLEAR=y CONFIG_CMD_ECHO=y +CONFIG_CMD_ECHO_E=y # # memory @@ -172,9 +174,9 @@ CONFIG_CMD_FLASH=y # booting # CONFIG_CMD_BOOTM=y -# CONFIG_CMD_BOOTM_ZLIB is not set -# CONFIG_CMD_BOOTM_BZLIB is not set -# CONFIG_CMD_BOOTM_SHOW_TYPE is not set +CONFIG_CMD_BOOTM_ZLIB=y +CONFIG_CMD_BOOTM_BZLIB=y +CONFIG_CMD_BOOTM_SHOW_TYPE=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTU=y # CONFIG_CMD_LINUX16 is not set @@ -188,6 +190,7 @@ CONFIG_CMD_HELP=y CONFIG_CMD_DEVINFO=y CONFIG_CMD_BMP=y CONFIG_CMD_GPIO=y +CONFIG_CMD_UNLZO=y CONFIG_NET=y CONFIG_NET_DHCP=y # CONFIG_NET_RARP is not set @@ -243,5 +246,9 @@ CONFIG_DRIVER_VIDEO_IMX=y # CONFIG_FS_CRAMFS is not set CONFIG_FS_RAMFS=y CONFIG_FS_DEVFS=y +CONFIG_ZLIB=y +CONFIG_BZLIB=y CONFIG_CRC32=y # CONFIG_GENERIC_FIND_NEXT_BIT is not set +CONFIG_PROCESS_ESCAPE_SEQUENCE=y +CONFIG_LZO_DECOMPRESS=y diff --git a/arch/arm/configs/eukrea_cpuimx27_defconfig b/arch/arm/configs/eukrea_cpuimx27_defconfig index 3b92c37ff2..a1cf1adb74 100644 --- a/arch/arm/configs/eukrea_cpuimx27_defconfig +++ b/arch/arm/configs/eukrea_cpuimx27_defconfig @@ -92,7 +92,7 @@ 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=0x800000 # CONFIG_BROKEN is not set # CONFIG_EXPERIMENTAL is not set CONFIG_MACH_HAS_LOWLEVEL_INIT=y |