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/cpu/ppc4xx/ocm.c | |
| parent | baf449fc5ff96f071bb0e3789fd3265f6d4fd9a0 (diff) | |
| parent | 92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb (diff) | |
| download | u-boot-imx-cb5473205206c7f14cbb1e747f28ec75b48826e2.zip u-boot-imx-cb5473205206c7f14cbb1e747f28ec75b48826e2.tar.gz u-boot-imx-cb5473205206c7f14cbb1e747f28ec75b48826e2.tar.bz2 | |
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/cpu/ppc4xx/ocm.c')
| -rw-r--r-- | post/cpu/ppc4xx/ocm.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/post/cpu/ppc4xx/ocm.c b/post/cpu/ppc4xx/ocm.c index 88aa93e..584e30c 100644 --- a/post/cpu/ppc4xx/ocm.c +++ b/post/cpu/ppc4xx/ocm.c @@ -38,19 +38,19 @@ DECLARE_GLOBAL_DATA_PTR; #define OCM_TEST_PATTERN1 0x55555555 #define OCM_TEST_PATTERN2 0xAAAAAAAA -#if CONFIG_POST & CFG_POST_OCM +#if CONFIG_POST & CONFIG_SYS_POST_OCM static uint ocm_status_read(void) { - return in_be32((void *)CFG_OCM_STATUS_ADDR) & - CFG_OCM_STATUS_MASK; + return in_be32((void *)CONFIG_SYS_OCM_STATUS_ADDR) & + CONFIG_SYS_OCM_STATUS_MASK; } static void ocm_status_write(uint value) { - out_be32((void *)CFG_OCM_STATUS_ADDR, value | - (in_be32((void *)CFG_OCM_STATUS_ADDR) & - ~CFG_OCM_STATUS_MASK)); + out_be32((void *)CONFIG_SYS_OCM_STATUS_ADDR, value | + (in_be32((void *)CONFIG_SYS_OCM_STATUS_ADDR) & + ~CONFIG_SYS_OCM_STATUS_MASK)); } static inline int ocm_test_word(uint value, uint *address) @@ -68,11 +68,11 @@ int ocm_post_test(int flags) { uint old_value; int ret = 0; - uint *address = (uint*)CFG_OCM_BASE; + uint *address = (uint*)CONFIG_SYS_OCM_BASE; - if (ocm_status_read() == CFG_OCM_STATUS_OK) + if (ocm_status_read() == CONFIG_SYS_OCM_STATUS_OK) return 0; - for (; address < (uint*)(CFG_OCM_BASE + CFG_OCM_SIZE); address++) { + for (; address < (uint*)(CONFIG_SYS_OCM_BASE + CONFIG_SYS_OCM_SIZE); address++) { old_value = *address; if (ocm_test_word(OCM_TEST_PATTERN1, address) || ocm_test_word(OCM_TEST_PATTERN2, address)) { @@ -83,7 +83,7 @@ int ocm_post_test(int flags) } *address = old_value; } - ocm_status_write(ret ? CFG_OCM_STATUS_FAIL : CFG_OCM_STATUS_OK); + ocm_status_write(ret ? CONFIG_SYS_OCM_STATUS_FAIL : CONFIG_SYS_OCM_STATUS_OK); return ret; } -#endif /* CONFIG_POST & CFG_POST_OCM */ +#endif /* CONFIG_POST & CONFIG_SYS_POST_OCM */ |