diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-04-27 22:57:41 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-04-27 22:57:41 +0200 |
| commit | c303176aa0cf8c5fc38e7c2d5e181e89cca72ef6 (patch) | |
| tree | cfac3ea66f6977c3875dbb091370ee8483e462cb /include/configs | |
| parent | c88d6ab19ffab06f372b15c290bdf5d6f1ebfe9a (diff) | |
| parent | 7e1afb62a7e68843248b9a76a265c9193e716768 (diff) | |
| download | u-boot-imx-c303176aa0cf8c5fc38e7c2d5e181e89cca72ef6.zip u-boot-imx-c303176aa0cf8c5fc38e7c2d5e181e89cca72ef6.tar.gz u-boot-imx-c303176aa0cf8c5fc38e7c2d5e181e89cca72ef6.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/socrates.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 9641041..89f7cc4 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -174,7 +174,7 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET -#define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256kB for Mon */ +#define CONFIG_SYS_MONITOR_LEN (384 * 1024) /* Reserve 384KiB for Mon */ #define CONFIG_SYS_MALLOC_LEN (4 << 20) /* Reserve 4 MB for malloc */ /* FPGA and NAND */ @@ -342,19 +342,19 @@ */ #include <config_cmd_default.h> +#define CONFIG_CMD_BMP #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_DTT #undef CONFIG_CMD_EEPROM +#define CONFIG_CMD_EXT2 /* EXT2 Support */ #define CONFIG_CMD_I2C #define CONFIG_CMD_SDRAM #define CONFIG_CMD_MII -#define CONFIG_CMD_NFS +#undef CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_SNTP #define CONFIG_CMD_USB -#define CONFIG_CMD_EXT2 /* EXT2 Support */ -#define CONFIG_CMD_BMP #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI |