* Code cleanup:

[karo-tx-uboot.git] / board / walnut405 / flash.c

diff --git a/board/walnut405/flash.c b/board/walnut405/flash.c
index c9c7cbfdc2d1bc249d126cc319217fe203d6e8c9..462c09eb6c6ecb4e2432d4b4f92acc4ef4797484 100644 (file)
--- a/board/walnut405/flash.c
+++ b/board/walnut405/flash.c
@@ -66,8 +66,8 @@ unsigned long flash_init (void)
 {
        unsigned long size_b0, size_b1;
        int i;
-        uint pbcr;
-        unsigned long base_b0, base_b1;
+       uint pbcr;
+       unsigned long base_b0, base_b1;
 
        /* Init: no FLASHes known */
        for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) {
@@ -165,7 +165,6 @@ unsigned long flash_init (void)
 }
 
 
-
 /*-----------------------------------------------------------------------
  */
 static void flash_get_offsets (ulong base, flash_info_t *info)
@@ -173,11 +172,11 @@ static void flash_get_offsets (ulong base, flash_info_t *info)
        int i;
 
        /* set up sector start address table */
-        if (((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) ||
+       if (((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) ||
            (info->flash_id  == FLASH_AM040)){
            for (i = 0; i < info->sector_count; i++)
                info->start[i] = base + (i * 0x00010000);
-        } else {
+       } else {
            if (info->flash_id & FLASH_BTYPE) {
                /* set sector offsets for bottom boot block type        */
                info->start[0] = base + 0x00000000;
@@ -205,10 +204,10 @@ static void flash_get_offsets (ulong base, flash_info_t *info)
 void flash_print_info  (flash_info_t *info)
 {
        int i;
-        int k;
-        int size;
-        int erased;
-        volatile unsigned long *flash;
+       int k;
+       int size;
+       int erased;
+       volatile unsigned long *flash;
 
        if (info->flash_id == FLASH_UNKNOWN) {
                printf ("missing or unknown FLASH type\n");
@@ -254,24 +253,24 @@ void flash_print_info  (flash_info_t *info)
 
        printf ("  Sector Start Addresses:");
        for (i=0; i<info->sector_count; ++i) {
-                /*
-                 * Check if whole sector is erased
-                 */
-                if (i != (info->sector_count-1))
-                  size = info->start[i+1] - info->start[i];
-                else
-                  size = info->start[0] + info->size - info->start[i];
-                erased = 1;
-                flash = (volatile unsigned long *)info->start[i];
-                size = size >> 2;        /* divide by 4 for longword access */
-                for (k=0; k<size; k++)
-                  {
-                    if (*flash++ != 0xffffffff)
-                      {
-                        erased = 0;
-                        break;
-                      }
-                  }
+               /*
+                * Check if whole sector is erased
+                */
+               if (i != (info->sector_count-1))
+                 size = info->start[i+1] - info->start[i];
+               else
+                 size = info->start[0] + info->size - info->start[i];
+               erased = 1;
+               flash = (volatile unsigned long *)info->start[i];
+               size = size >> 2;        /* divide by 4 for longword access */
+               for (k=0; k<size; k++)
+                 {
+                   if (*flash++ != 0xffffffff)
+                     {
+                       erased = 0;
+                       break;
+                     }
+                 }
 
                if ((i % 5) == 0)
                        printf ("\n   ");
@@ -306,7 +305,7 @@ static ulong flash_get_size (vu_long *addr, flash_info_t *info)
        short i;
        FLASH_WORD_SIZE value;
        ulong base = (ulong)addr;
-        volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)addr;
+       volatile FLASH_WORD_SIZE *addr2 = (FLASH_WORD_SIZE *)addr;
 
        /* Write auto select command: read Manufacturer ID */
        addr2[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA;
@@ -338,14 +337,14 @@ static ulong flash_get_size (vu_long *addr, flash_info_t *info)
 
 #ifdef CONFIG_ADCIOP
        value = addr2[0];                       /* device ID            */
-        /*        printf("\ndev_code=%x\n", value); */
+       /*        printf("\ndev_code=%x\n", value); */
 #else
        value = addr2[1];                       /* device ID            */
 #endif
 
        switch (value) {
        case (FLASH_WORD_SIZE)AMD_ID_F040B:
-               info->flash_id += FLASH_AM040;
+               info->flash_id += FLASH_AM040;
                info->sector_count = 8;
                info->size = 0x0080000; /* => 512 ko */
                break;
@@ -416,11 +415,11 @@ static ulong flash_get_size (vu_long *addr, flash_info_t *info)
        }
 
        /* set up sector start address table */
-        if (((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) ||
+       if (((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST) ||
            (info->flash_id  == FLASH_AM040)){
            for (i = 0; i < info->sector_count; i++)
                info->start[i] = base + (i * 0x00010000);
-        } else {
+       } else {
            if (info->flash_id & FLASH_BTYPE) {
                /* set sector offsets for bottom boot block type        */
                info->start[0] = base + 0x00000000;
@@ -451,10 +450,10 @@ static ulong flash_get_size (vu_long *addr, flash_info_t *info)
                info->protect[i] = addr2[4] & 1;
 #else
                addr2 = (volatile FLASH_WORD_SIZE *)(info->start[i]);
-                if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST)
-                  info->protect[i] = 0;
-                else
-                  info->protect[i] = addr2[2] & 1;
+               if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_SST)
+                 info->protect[i] = 0;
+               else
+                 info->protect[i] = addr2[2] & 1;
 #endif
        }
 
@@ -465,9 +464,9 @@ static ulong flash_get_size (vu_long *addr, flash_info_t *info)
 #if 0 /* test-only */
 #ifdef CONFIG_ADCIOP
                addr2 = (volatile unsigned char *)info->start[0];
-                addr2[ADDR0] = 0xAA;
-                addr2[ADDR1] = 0x55;
-                addr2[ADDR0] = 0xF0;  /* reset bank */
+               addr2[ADDR0] = 0xAA;
+               addr2[ADDR1] = 0x55;
+               addr2[ADDR0] = 0xF0;  /* reset bank */
 #else
                addr2 = (FLASH_WORD_SIZE *)info->start[0];
                *addr2 = (FLASH_WORD_SIZE)0x00F000F0;   /* reset bank */
@@ -489,15 +488,15 @@ int wait_for_DQ7(flash_info_t *info, int sect)
        start = get_timer (0);
     last  = start;
     while ((addr[0] & (FLASH_WORD_SIZE)0x00800080) != (FLASH_WORD_SIZE)0x00800080) {
-        if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
-            printf ("Timeout\n");
-            return -1;
-        }
-        /* show that we're waiting */
-        if ((now - last) > 1000) {  /* every second */
-            putc ('.');
-            last = now;
-        }
+       if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
+           printf ("Timeout\n");
+           return -1;
+       }
+       /* show that we're waiting */
+       if ((now - last) > 1000) {  /* every second */
+           putc ('.');
+           last = now;
+       }
     }
        return 0;
 }