diff options
| author | Tom Rini <trini@ti.com> | 2012-10-26 15:44:31 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-26 15:44:31 -0700 |
| commit | 5bb3505fa867ded03cbee83f7722ab5182930637 (patch) | |
| tree | 1830ce86f88d280eb1a004d3f954f684c548cdce /include/configs/cm_t35.h | |
| parent | 8440f18a4818d52ba51bb9f0b07ce6439f1b6a57 (diff) | |
| parent | b68d6712c379735e886ef9c01b946bc36f295273 (diff) | |
| download | u-boot-imx-5bb3505fa867ded03cbee83f7722ab5182930637.zip u-boot-imx-5bb3505fa867ded03cbee83f7722ab5182930637.tar.gz u-boot-imx-5bb3505fa867ded03cbee83f7722ab5182930637.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/cm_t35.h')
| -rw-r--r-- | include/configs/cm_t35.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 46c556d..568ae8e 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -231,7 +231,7 @@ "bootm ${loadaddr}\0" \ #define CONFIG_BOOTCOMMAND \ - "if mmc rescan ${mmcdev}; then " \ + "mmc dev ${mmcdev}; if mmc rescan; then " \ "if run loadbootscript; then " \ "run bootscript; " \ "else " \ @@ -289,25 +289,15 @@ */ /* **** PISMO SUPPORT *** */ - /* Configure the PISMO */ #define PISMO1_NAND_SIZE GPMC_SIZE_128M -#define PISMO1_ONEN_SIZE GPMC_SIZE_128M - -#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */ - -#if defined(CONFIG_CMD_NAND) -#define CONFIG_SYS_FLASH_BASE PISMO1_NAND_BASE -#endif /* Monitor at start of flash */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP +#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */ #define CONFIG_ENV_IS_IN_NAND -#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */ #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ - #define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET |