rename CFG_ macros to CONFIG_SYS

[platform/kernel/u-boot.git] / board / sc520_cdp / flash.c

diff --git a/board/sc520_cdp/flash.c b/board/sc520_cdp/flash.c
index 493d51a..dcb8c57 100644 (file)
--- a/board/sc520_cdp/flash.c
+++ b/board/sc520_cdp/flash.c
@@ -222,7 +222,7 @@ ulong flash_init(void)
                ulong flashbase = 0;
                int sectsize = 0;
 
-               memset(flash_info[i].protect, 0, CFG_MAX_FLASH_SECT);
+               memset(flash_info[i].protect, 0, CONFIG_SYS_MAX_FLASH_SECT);
                switch (i) {
                case 0:
                        flashbase = SC520_FLASH_BANK0_BASE;
@@ -370,7 +370,7 @@ static u32 _amd_erase_flash(u32 addr, u32 sector)
        while (((*(volatile u32*)(addr + sector)) & 0x80808080) != 0x80808080) {
 
                elapsed += *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI);
-               if (elapsed > ((CFG_FLASH_ERASE_TOUT/CFG_HZ) * 1000)) {
+               if (elapsed > ((CONFIG_SYS_FLASH_ERASE_TOUT/CONFIG_SYS_HZ) * 1000)) {
                        *(volatile u32*)(addr) = 0xf0f0f0f0;
                        return 1;
                }
@@ -493,7 +493,7 @@ static int _amd_write_word(unsigned start, unsigned dest, unsigned data)
        /* data polling for D7 */
        while ((dest2[0] & 0x80808080) != (data2[0] & 0x80808080)) {
                elapsed += *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI);
-               if (elapsed > ((CFG_FLASH_WRITE_TOUT/CFG_HZ) * 1000)) {
+               if (elapsed > ((CONFIG_SYS_FLASH_WRITE_TOUT/CONFIG_SYS_HZ) * 1000)) {
                        addr2[0] = 0xf0f0f0f0;
                        return 1;
                }