* Patch by Gleb Natapov, 19 Sep 2003:

[u-boot] / board / trab / flash.c

diff --git a/board/trab/flash.c b/board/trab/flash.c
index a4f164b469be75b6ac0e266e442e8c0975379f04..764c57b482fc7e06ffe4d26974f8c12c625f85b8 100644 (file)
--- a/board/trab/flash.c
+++ b/board/trab/flash.c
@@ -39,7 +39,10 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS];
 #define CMD_PROGRAM            0x00A000A0
 #define CMD_UNLOCK_BYPASS      0x00200020
 #define CMD_READ_MANF_ID       0x00900090
+#define CMD_UNLOCK_BYPASS_RES1 0x00900090
+#define CMD_UNLOCK_BYPASS_RES2 0x00000000
 
+#define MEM_FLASH_ADDR         (*(volatile u32 *)CFG_FLASH_BASE)
 #define MEM_FLASH_ADDR1                (*(volatile u32 *)(CFG_FLASH_BASE + (0x00000555 << 2)))
 #define MEM_FLASH_ADDR2                (*(volatile u32 *)(CFG_FLASH_BASE + (0x000002AA << 2)))
 
@@ -99,7 +102,7 @@ ulong flash_init (void)
         */
        flash_protect ( FLAG_PROTECT_SET,
                        CFG_FLASH_BASE,
-                       CFG_FLASH_BASE + _armboot_end_data - _armboot_start,
+                       CFG_FLASH_BASE + monitor_flash_len - 1,
                        &flash_info[0]);
 
        flash_protect ( FLAG_PROTECT_SET,
@@ -124,11 +127,10 @@ void flash_print_info (flash_info_t * info)
 
        switch (info->flash_id & FLASH_VENDMASK) {
        case (FLASH_MAN_AMD & FLASH_VENDMASK):
-               printf ("AMD: ");
-               break;
-       default:
-               printf ("Unknown Vendor ");
-               break;
+                       printf ("AMD ");                break;
+       case (FLASH_MAN_FUJ & FLASH_VENDMASK):
+                       printf ("FUJITSU ");            break;
+       default:        printf ("Unknown Vendor ");     break;
        }
 
        switch (info->flash_id & FLASH_TYPEMASK) {
@@ -186,9 +188,12 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
                return ERR_INVAL;
        }
 
-       if ((info->flash_id & FLASH_VENDMASK) !=
-               (FLASH_MAN_AMD & FLASH_VENDMASK)) {
-               return ERR_UNKNOWN_FLASH_VENDOR;
+       switch (info->flash_id & FLASH_VENDMASK) {
+       case (FLASH_MAN_AMD & FLASH_VENDMASK):  break;  /* OK */
+       case (FLASH_MAN_FUJ & FLASH_VENDMASK):  break;  /* OK */
+       default:
+               debug ("## flash_erase: unknown manufacturer\n");
+               return (ERR_UNKNOWN_FLASH_VENDOR);
        }
 
        prot = 0;
@@ -329,9 +334,6 @@ volatile static int write_word (flash_info_t * info, ulong dest,
 #endif
        iflag = disable_interrupts ();
 
-       MEM_FLASH_ADDR1 = CMD_UNLOCK1;
-       MEM_FLASH_ADDR2 = CMD_UNLOCK2;
-       MEM_FLASH_ADDR1 = CMD_UNLOCK_BYPASS;
        *addr = CMD_PROGRAM;
        *addr = data;
 
@@ -400,6 +402,10 @@ int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
        int l;
        int i, rc;
 
+       MEM_FLASH_ADDR1 = CMD_UNLOCK1;
+       MEM_FLASH_ADDR2 = CMD_UNLOCK2;
+       MEM_FLASH_ADDR1 = CMD_UNLOCK_BYPASS;
+
        wp = (addr & ~3);       /* get lower word aligned address */
 
        /*
@@ -420,7 +426,7 @@ int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
                }
 
                if ((rc = write_word (info, wp, data)) != 0) {
-                       return (rc);
+                       goto Done;
                }
                wp += 4;
        }
@@ -429,9 +435,17 @@ int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
         * handle word aligned part
         */
        while (cnt >= 4) {
-               data = *((vu_long *) src);
+               if (((ulong)src) & 0x3) {
+                       for (i = 0; i < 4; i++) {
+                               ((char *)&data)[i] = ((vu_char *)src)[i];
+                       }
+               }
+               else {
+                       data = *((vu_long *) src);
+               }
+
                if ((rc = write_word (info, wp, data)) != 0) {
-                       return (rc);
+                       goto Done;
                }
                src += 4;
                wp += 4;
@@ -439,7 +453,8 @@ int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
        }
 
        if (cnt == 0) {
-               return ERR_OK;
+               rc = ERR_OK;
+               goto Done;
        }
 
        /*
@@ -454,7 +469,14 @@ int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
                data = (data >> 8) | (*(uchar *) cp << 24);
        }
 
-       return write_word (info, wp, data);
+       rc = write_word (info, wp, data);
+
+       Done:
+
+       MEM_FLASH_ADDR = CMD_UNLOCK_BYPASS_RES1;
+       MEM_FLASH_ADDR = CMD_UNLOCK_BYPASS_RES2;
+
+       return (rc);
 }
 
 /*-----------------------------------------------------------------------
@@ -477,7 +499,9 @@ static ulong flash_get_size (vu_long *addr, flash_info_t *info)
        case AMD_MANUFACT:
                info->flash_id = FLASH_MAN_AMD;
                break;
-
+       case FUJ_MANUFACT:
+               info->flash_id = FLASH_MAN_FUJ;
+               break;
        default:
                info->flash_id = FLASH_UNKNOWN;
                info->sector_count = 0;