diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /post/drivers/memory.c | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
| download | u-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2 | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'post/drivers/memory.c')
| -rw-r--r-- | post/drivers/memory.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/post/drivers/memory.c b/post/drivers/memory.c index e32020f..0062360 100644 --- a/post/drivers/memory.c +++ b/post/drivers/memory.c @@ -153,7 +153,7 @@ #include <post.h> #include <watchdog.h> -#if CONFIG_POST & CFG_POST_MEMORY +#if CONFIG_POST & CONFIG_SYS_POST_MEMORY DECLARE_GLOBAL_DATA_PTR; @@ -460,11 +460,11 @@ int memory_post_test (int flags) 256 << 20 : bd->bi_memsize) - (1 << 20); /* Limit area to be tested with the board info struct */ - if (CFG_SDRAM_BASE + memsize > (ulong)bd) - memsize = (ulong)bd - CFG_SDRAM_BASE; + if (CONFIG_SYS_SDRAM_BASE + memsize > (ulong)bd) + memsize = (ulong)bd - CONFIG_SYS_SDRAM_BASE; if (flags & POST_SLOWTEST) { - ret = memory_post_tests (CFG_SDRAM_BASE, memsize); + ret = memory_post_tests (CONFIG_SYS_SDRAM_BASE, memsize); } else { /* POST_NORMAL */ unsigned long i; @@ -480,4 +480,4 @@ int memory_post_test (int flags) return ret; } -#endif /* CONFIG_POST & CFG_POST_MEMORY */ +#endif /* CONFIG_POST & CONFIG_SYS_POST_MEMORY */ |