board/sandburst/common/flash.c: Fix GCC 4.6 build warning

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

diff --git a/board/sandburst/common/flash.c b/board/sandburst/common/flash.c
index c65cb9607068294ff52e841c7e58d122728ef6d8..818a7c3929cefaf6293b2ea40232a682ea9c65a6 100644 (file)
--- a/board/sandburst/common/flash.c
+++ b/board/sandburst/common/flash.c
@@ -304,7 +304,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
 {
        volatile FLASH_WORD_SIZE *addr = (FLASH_WORD_SIZE *)(info->start[0]);
        volatile FLASH_WORD_SIZE *addr2;
 {
        volatile FLASH_WORD_SIZE *addr = (FLASH_WORD_SIZE *)(info->start[0]);
        volatile FLASH_WORD_SIZE *addr2;

-       int flag, prot, sect, l_sect;
+       int flag, prot, sect;

        int i;
 
        if ((s_first < 0) || (s_first > s_last)) {
        int i;
 
        if ((s_first < 0) || (s_first > s_last)) {


@@ -335,8 +335,6 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
                printf ("\n");
        }
 
                printf ("\n");
        }
 

-       l_sect = -1;
-

        /* Disable interrupts which might cause a timeout here */
        flag = disable_interrupts();
 
        /* Disable interrupts which might cause a timeout here */
        flag = disable_interrupts();
 


@@ -363,7 +361,6 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
                                addr[ADDR1] = (FLASH_WORD_SIZE)0x00550055;
                                addr2[0] = (FLASH_WORD_SIZE)0x00300030;  /* sector erase */
                        }
                                addr[ADDR1] = (FLASH_WORD_SIZE)0x00550055;
                                addr2[0] = (FLASH_WORD_SIZE)0x00300030;  /* sector erase */
                        }

-                       l_sect = sect;

                        /*
                         * Wait for each sector to complete, it's more
                         * reliable.  According to AMD Spec, you must
                        /*
                         * Wait for each sector to complete, it's more
                         * reliable.  According to AMD Spec, you must