rename CFG_ macros to CONFIG_SYS

[platform/kernel/u-boot.git] / post / cpu / ppc4xx / ocm.c

diff --git a/post/cpu/ppc4xx/ocm.c b/post/cpu/ppc4xx/ocm.c
index 88aa93e..584e30c 100644 (file)
--- 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 */