imported Freescale specific U-Boot additions for i.MX28,... release L2.6.31_10.08.01

[karo-tx-uboot.git] / board / psyent / common / AMDLV065D.c

diff --git a/board/psyent/common/AMDLV065D.c b/board/psyent/common/AMDLV065D.c
index 8a7b14ee2f5fa47df09e66a69953248a0cd05bae..0fcf354cdc4289cab4a7f1515066937416c9a226 100755 (executable)
--- a/board/psyent/common/AMDLV065D.c
+++ b/board/psyent/common/AMDLV065D.c
@@ -30,7 +30,7 @@
 #endif
 
 #define SECTSZ         (64 * 1024)
-flash_info_t flash_info[CFG_MAX_FLASH_BANKS];
+flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];
 
 /*----------------------------------------------------------------------*/
 unsigned long flash_init (void)
@@ -39,18 +39,18 @@ unsigned long flash_init (void)
        unsigned long addr;
        flash_info_t *fli = &flash_info[0];
 
-       fli->size = CFG_FLASH_SIZE;
-       fli->sector_count = CFG_MAX_FLASH_SECT;
+       fli->size = CONFIG_SYS_FLASH_SIZE;
+       fli->sector_count = CONFIG_SYS_MAX_FLASH_SECT;
        fli->flash_id = FLASH_MAN_AMD + FLASH_AMDLV065D;
 
-       addr = CFG_FLASH_BASE;
+       addr = CONFIG_SYS_FLASH_BASE;
        for (i = 0; i < fli->sector_count; ++i) {
                fli->start[i] = addr;
                addr += SECTSZ;
                fli->protect[i] = 1;
        }
 
-       return (CFG_FLASH_SIZE);
+       return (CONFIG_SYS_FLASH_SIZE);
 }
 /*--------------------------------------------------------------------*/
 void flash_print_info (flash_info_t * info)
@@ -135,7 +135,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
                        while ( readb (addr2) != 0xff) {
                                udelay (1000 * 1000);
                                putc ('.');
-                               if (get_timer (start) > CFG_FLASH_ERASE_TOUT) {
+                               if (get_timer (start) > CONFIG_SYS_FLASH_ERASE_TOUT) {
                                        printf ("timeout\n");
                                        return 1;
                                }
@@ -177,7 +177,7 @@ int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
                /* Verify write */
                start = get_timer (0);
                while (readb (dst) != b) {
-                       if (get_timer (start) > CFG_FLASH_WRITE_TOUT) {
+                       if (get_timer (start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
                                return 1;
                        }
                }