global: Move remaining CONFIG_SYS_* to CFG_SYS_*

[pandora-u-boot.git] / board / freescale / m5253demo / flash.c

diff --git a/board/freescale/m5253demo/flash.c b/board/freescale/m5253demo/flash.c
index bff1ac5..fbd4835 100644 (file)
--- a/board/freescale/m5253demo/flash.c
+++ b/board/freescale/m5253demo/flash.c
@@ -42,7 +42,7 @@ ulong flash_init(void)
        ulong size = 0;
        ulong fbase = 0;
 
-       fbase = (ulong) CONFIG_SYS_FLASH_BASE;
+       fbase = (ulong) CFG_SYS_FLASH_BASE;
        flash_get_size((FPWV *) fbase, &flash_info[0]);
        flash_get_offsets((ulong) fbase, &flash_info[0]);
        fbase += flash_info[0].size;
@@ -64,9 +64,9 @@ int flash_get_offsets(ulong base, flash_info_t * info)
 
                info->start[0] = base;
                info->protect[0] = 0;
-               for (i = 1; i < CONFIG_SYS_SST_SECT; i++) {
+               for (i = 1; i < CFG_SYS_SST_SECT; i++) {
                        info->start[i] = info->start[i - 1]
-                                               + CONFIG_SYS_SST_SECTSZ;
+                                               + CFG_SYS_SST_SECTSZ;
                        info->protect[i] = 0;
                }
        }
@@ -162,8 +162,8 @@ ulong flash_get_size(FPWV * addr, flash_info_t * info)
 
        info->sector_count = 0;
        info->size = 0;
-       info->sector_count = CONFIG_SYS_SST_SECT;
-       info->size = CONFIG_SYS_SST_SECT * CONFIG_SYS_SST_SECTSZ;
+       info->sector_count = CFG_SYS_SST_SECT;
+       info->size = CFG_SYS_SST_SECT * CFG_SYS_SST_SECTSZ;
 
        /* reset ID mode */
        *addr = (FPWV) 0x00F000F0;
@@ -222,7 +222,7 @@ int flash_erase(flash_info_t * info, int s_first, int s_last)
 
        start = get_timer(0);
 
-       if ((s_last - s_first) == (CONFIG_SYS_SST_SECT - 1)) {
+       if ((s_last - s_first) == (CFG_SYS_SST_SECT - 1)) {
                if (prot == 0) {
                        addr = (FPWV *) info->start[0];
 
@@ -259,7 +259,7 @@ int flash_erase(flash_info_t * info, int s_first, int s_last)
                                enable_interrupts();
 
                        return 0;
-               } else if (prot == CONFIG_SYS_SST_SECT) {
+               } else if (prot == CFG_SYS_SST_SECT) {
                        return 1;
                }
        }
@@ -282,7 +282,7 @@ int flash_erase(flash_info_t * info, int s_first, int s_last)
 
                                        flag = disable_interrupts();
 
-                                       base = (FPWV *) (CONFIG_SYS_FLASH_BASE);        /* First sector */
+                                       base = (FPWV *) (CFG_SYS_FLASH_BASE);   /* First sector */
 
                                        base[FLASH_CYCLE1] = 0x00AA;    /* unlock */
                                        base[FLASH_CYCLE2] = 0x0055;    /* unlock */
@@ -411,7 +411,7 @@ int write_word(flash_info_t * info, FPWV * dest, u16 data)
                return (2);
        }
 
-       base = (FPWV *) (CONFIG_SYS_FLASH_BASE);
+       base = (FPWV *) (CFG_SYS_FLASH_BASE);
 
        /* Disable interrupts which might cause a timeout here */
        flag = disable_interrupts();