diff options
author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 07:18:01 (GMT) |
---|---|---|
committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 07:18:01 (GMT) |
commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
tree | ea1a183343573c2a48248923b96d316c0956727c /post/drivers/memory.c | |
parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
download | u-boot-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
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 */ |