commit 599e6d1ff1fbab0abda4ef685f6078c4d2f1d2eb Author: Nikita V. Youshchenko yoush@debian.org Date: Tue Sep 2 07:51:05 2008 +0400
ads5121: support for running from memory
This patch makes it possible to start u-boot from memory on ads5121 board.
It does two simple things: - skips initialization of memory controller if already running from memory, - helps u-boot to find it's environment in flash when CFG_MONITOR_BASE does not point to u-boot flash address.
Signed-off-by: Nikita V. Youshchenko yoush@debian.org
diff --git a/board/ads5121/ads5121.c b/board/ads5121/ads5121.c index deaa292..644d85e 100644 --- a/board/ads5121/ads5121.c +++ b/board/ads5121/ads5121.c @@ -120,8 +120,9 @@ phys_size_t initdram (int board_type) */ long int fixed_sdram (void) { - volatile immap_t *im = (immap_t *) CFG_IMMR; u32 msize = CFG_DDR_SIZE * 1024 * 1024; +#if CFG_MONITOR_BASE >= CFG_FLASH_BASE + volatile immap_t *im = (immap_t *) CFG_IMMR; u32 msize_log2 = __ilog2 (msize); u32 i;
@@ -203,7 +204,7 @@ long int fixed_sdram (void) /* Start MDDRC */ im->mddrc.ddr_time_config0 = CFG_MDDRC_TIME_CFG0_RUN; im->mddrc.ddr_sys_config = CFG_MDDRC_SYS_CFG_RUN; - +#endif return msize; }
diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h index d6f7e02..6ff7762 100644 --- a/include/configs/ads5121.h +++ b/include/configs/ads5121.h @@ -322,7 +322,12 @@ */ #define CONFIG_ENV_IS_IN_FLASH 1 /* This has to be a multiple of the Flash sector size */ +#if CFG_MONITOR_BASE >= CFG_FLASH_BASE #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#else +#define CFG_MONITOR_FLASH_BASE 0xfff00000 +#define CONFIG_ENV_ADDR (CFG_MONITOR_FLASH_BASE + CFG_MONITOR_LEN) +#endif #define CONFIG_ENV_SIZE 0x2000 #ifdef CONFIG_BKUP_FLASH #define CONFIG_ENV_SECT_SIZE 0x20000 /* one sector (256K) for env */