rename CFG_ macros to CONFIG_SYS

[karo-tx-uboot.git] / board / BuS / EB+MCF-EV123 / cfm_flash.c

diff --git a/board/BuS/EB+MCF-EV123/cfm_flash.c b/board/BuS/EB+MCF-EV123/cfm_flash.c
index b32638410228568a4fe098936d8c772d48c0c527..fe03b17581103efcf2905af50674e6064207785a 100644 (file)
--- a/board/BuS/EB+MCF-EV123/cfm_flash.c
+++ b/board/BuS/EB+MCF-EV123/cfm_flash.c
@@ -28,14 +28,14 @@
 
 #if defined(CONFIG_M5281) || defined(CONFIG_M5282)
 
-#if (CFG_CLK>20000000)
-       #define CFM_CLK  (((long) CFG_CLK / (400000 * 8) + 1) | 0x40)
+#if (CONFIG_SYS_CLK>20000000)
+       #define CFM_CLK  (((long) CONFIG_SYS_CLK / (400000 * 8) + 1) | 0x40)
 #else
-       #define CFM_CLK  ((long) CFG_CLK / 400000 + 1)
+       #define CFM_CLK  ((long) CONFIG_SYS_CLK / 400000 + 1)
 #endif
 
 #define cmf_backdoor_address(addr)     (((addr) & 0x0007FFFF) | 0x04000000 | \
-                                        (CFG_MBAR & 0xC0000000))
+                                        (CONFIG_SYS_MBAR & 0xC0000000))
 
 void cfm_flash_print_info (flash_info_t * info)
 {
@@ -60,8 +60,8 @@ void cfm_flash_init (flash_info_t * info)
        MCFCFM_MCR = 0;
        MCFCFM_CLKD = CFM_CLK;
        debug ("CFM Clock divider: %ld (%d Hz @ %ld Hz)\n",CFM_CLK,\
-               CFG_CLK / (2* ((CFM_CLK & 0x3F)+1) * (1+((CFM_CLK & 0x40)>>6)*7)),\
-               CFG_CLK);
+               CONFIG_SYS_CLK / (2* ((CFM_CLK & 0x3F)+1) * (1+((CFM_CLK & 0x40)>>6)*7)),\
+               CONFIG_SYS_CLK);
        MCFCFM_SACC = 0;
        MCFCFM_DACC = 0;
 
@@ -86,7 +86,7 @@ void cfm_flash_init (flash_info_t * info)
        {
                if (sector == 0)
                {
-                       info->start[sector] = CFG_INT_FLASH_BASE;
+                       info->start[sector] = CONFIG_SYS_INT_FLASH_BASE;
                }
                else
                {
@@ -173,7 +173,7 @@ int cfm_flash_write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cn
        dest = cmf_backdoor_address(addr);
        while ((cnt>=4) && (rc == ERR_OK))
        {
-               data =*((volatile u32 *) src);
+               data = *((volatile u32 *) src);
                *(volatile u32*) dest = data;
                MCFCFM_CMD = MCFCFM_CMD_PGM;
                MCFCFM_USTAT = MCFCFM_USTAT_CBEIF;
@@ -187,7 +187,7 @@ int cfm_flash_write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cn
        return rc;
 }
 
-#ifdef CFG_FLASH_PROTECTION
+#ifdef CONFIG_SYS_FLASH_PROTECTION
 
 int cfm_flash_protect(flash_info_t * info,long sector,int prot)
 {