diff options
| author | Sammy <r62914@freescale.com> | 2009-07-13 15:05:16 +0800 |
|---|---|---|
| committer | Fred Fan <r01011@freescale.com> | 2009-09-10 17:03:33 +0800 |
| commit | abf0610e5250ed69cc542e19f19c8a6812f4914e (patch) | |
| tree | a6b357c0dd2650e89c724448cde52b95944391cc /include/configs | |
| parent | 98ab00fc5434683e5e281156e24d6a52fa17a417 (diff) | |
| download | u-boot-imx-abf0610e5250ed69cc542e19f19c8a6812f4914e.zip u-boot-imx-abf0610e5250ed69cc542e19f19c8a6812f4914e.tar.gz u-boot-imx-abf0610e5250ed69cc542e19f19c8a6812f4914e.tar.bz2 | |
ENGR00114178 Support MMC/SD boot and enable dhcp in uboot on MX25
1. Support MMC/SD boot in uboot, however, it is disabled default and
user needs to enable manually by changing mx25_3stack.h;
2. Enable dhcp for network.
Signed-off-by: Sammy He <r62914@freescale.com>
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/mx25_3stack.h | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/include/configs/mx25_3stack.h b/include/configs/mx25_3stack.h index 05b3500..5e343ea 100644 --- a/include/configs/mx25_3stack.h +++ b/include/configs/mx25_3stack.h @@ -97,6 +97,17 @@ /* #define CONFIG_CMD_DATE */ #define CONFIG_CMD_NAND +/* + * MMC Configs + * */ +/* +#define CONFIG_FSL_MMC +#define CONFIG_MMC +#define CONFIG_CMD_MMC +#define CONFIG_DOS_PARTITION +#define CONFIG_CMD_FAT +#define CONFIG_MMC_BASE 0x0 */ + /* Disabled due to compilation errors in cmd_bootm.c (IMLS seems to require * that CONFIG_NO_FLASH is undefined). */ @@ -122,6 +133,8 @@ #define CONFIG_DRIVER_SMC911X_BASE CS5_BASE*/ /*#define CONFIG_HAS_ETH1*/ +#define CONFIG_CMD_NET +#define CONFIG_CMD_DHCP #define CONFIG_NET_MULTI 1 #define CONFIG_MXC_FEC #define CONFIG_MII @@ -174,12 +187,33 @@ #else #define PHYS_SDRAM_1_SIZE (64 * 1024 * 1024) #endif + +/* Monitor at beginning of flash */ +#if defined(CONFIG_FSL_SF) + #define CONFIG_FSL_ENV_IN_SF +#elif defined(CONFIG_FSL_MMC) + #define CONFIG_FSL_ENV_IN_MMC +#elif defined(CONFIG_CMD_NAND) + #define CONFIG_FSL_ENV_IN_NAND +#endif + /*----------------------------------------------------------------------- * FLASH and environment organization */ +#if defined(CONFIG_FSL_ENV_IN_NAND) + #define CONFIG_ENV_IS_IN_NAND 1 + #define CONFIG_ENV_OFFSET 0x80000 +#elif defined(CONFIG_FSL_ENV_IN_MMC) + #define CONFIG_ENV_IS_IN_MMC 1 + #define CONFIG_ENV_OFFSET 0x100000 +#elif defined(CONFIG_FSL_ENV_IN_SF) + #define CONFIG_ENV_IS_IN_SPI_FLASH 1 + #define CONFIG_ENV_SPI_CS 1 + #define CONFIG_ENV_OFFSET 0x100000 +#else + #define CONFIG_ENV_IS_NOWHERE 1 +#endif -#define CONFIG_ENV_IS_IN_NAND 1 -#define CONFIG_ENV_OFFSET 0x80000 /* 2nd block */ #define CONFIG_ENV_SECT_SIZE (256 * 1024) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE |