diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
| commit | cb5473205206c7f14cbb1e747f28ec75b48826e2 (patch) | |
| tree | 8f4808d60917100b18a10b05230f7638a0a9bbcc /post/drivers/memory.c | |
| parent | baf449fc5ff96f071bb0e3789fd3265f6d4fd9a0 (diff) | |
| parent | 92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb (diff) | |
| download | olio-uboot-2014.01-cb5473205206c7f14cbb1e747f28ec75b48826e2.tar.xz olio-uboot-2014.01-cb5473205206c7f14cbb1e747f28ec75b48826e2.zip | |
Merge branch 'fixes' into cleanups
Conflicts:
board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/configs/atngw100.h
include/configs/atstk1002.h
include/configs/atstk1003.h
include/configs/atstk1004.h
include/configs/atstk1006.h
include/configs/favr-32-ezkit.h
include/configs/hammerhead.h
include/configs/mimc200.h
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 e32020f82..006236009 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 */ |