rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH

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

diff --git a/board/cmc_pu2/flash.c b/board/cmc_pu2/flash.c
index f119765..0419d76 100644 (file)
--- a/board/cmc_pu2/flash.c
+++ b/board/cmc_pu2/flash.c
@@ -71,7 +71,7 @@ unsigned long flash_init (void)
                      flash_get_info(CFG_MONITOR_BASE));
 #endif
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
                      CFG_ENV_ADDR,
@@ -264,7 +264,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
 {
        vu_short *addr = (vu_short *)(info->start[0]);
        int flag, prot, sect, ssect, l_sect;
-       ulong start, now, last;
+       ulong now, last;
 
        debug ("flash_erase: first: %d last: %d\n", s_first, s_last);
 
@@ -335,11 +335,11 @@ int       flash_erase (flash_info_t *info, int s_first, int s_last)
                if (l_sect < 0)
                        goto DONE;
 
-               start = get_timer (0);
-               last  = start;
+               reset_timer_masked ();
+               last  = 0;
                addr = (vu_short *)(info->start[l_sect]);
                while ((addr[0] & 0x0080) != 0x0080) {
-                       if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
+                       if ((now = get_timer_masked ()) > CFG_FLASH_ERASE_TOUT) {
                                printf ("Timeout\n");
                                return 1;
                        }
@@ -394,6 +394,7 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
        while (cnt >= 2) {
                data = *((vu_short *)src);
                if ((rc = write_word_amd(info, (vu_short *)wp, data)) != 0) {
+printf ("write_buff 1: write_word_amd() rc=%d\n", rc);
                        return (rc);
                }
                src += 2;
@@ -402,13 +403,13 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
        }
 
        if (cnt == 0) {
-               return (0);
+               return (ERR_OK);
        }
 
        if (cnt == 1) {
-               data = (*((volatile u8 *) src)) | (*((volatile u8 *) (wp + 1))
-                               << 8);
+               data = (*((volatile u8 *) src)) | (*((volatile u8 *) (wp + 1)) << 8);
                if ((rc = write_word_amd(info, (vu_short *)wp, data)) != 0) {
+printf ("write_buff 1: write_word_amd() rc=%d\n", rc);
                        return (rc);
                }
                src += 1;
@@ -431,7 +432,6 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
  */
 static int write_word_amd (flash_info_t *info, vu_short *dest, ushort data)
 {
-       ulong start;
        int flag;
        vu_short *base;         /* first address in flash bank  */
 
@@ -455,11 +455,11 @@ static int write_word_amd (flash_info_t *info, vu_short *dest, ushort data)
        if (flag)
                enable_interrupts();
 
-       start = get_timer (0);
+       reset_timer_masked ();
 
        /* data polling for D7 */
        while ((*dest & 0x0080) != (data & 0x0080)) {
-               if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
+               if (get_timer_masked () > CFG_FLASH_WRITE_TOUT) {
                        *dest = 0x00F0; /* reset bank */
                        return (1);
                }