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

Fix:
In file included from flash.c:45:0:
../common/flash.c: In function 'flash_erase':
../common/flash.c:399:24: warning: variable 'l_sect' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
Acked-by: Stefan Roese <sr@denx.de>

diff --git a/board/amcc/common/flash.c b/board/amcc/common/flash.c
index 8f23375170998ff8ee35e3c7c179a74d63fd5487..1960fc1905a708d2b112257ff4abf6da560d2da0 100644 (file)
--- a/board/amcc/common/flash.c
+++ b/board/amcc/common/flash.c
@@ -396,7 +396,7 @@ int flash_erase(flash_info_t * info, int s_first, int s_last)
 {
        volatile CONFIG_SYS_FLASH_WORD_SIZE *addr = (CONFIG_SYS_FLASH_WORD_SIZE *) (info->start[0]);
        volatile CONFIG_SYS_FLASH_WORD_SIZE *addr2;
 {
        volatile CONFIG_SYS_FLASH_WORD_SIZE *addr = (CONFIG_SYS_FLASH_WORD_SIZE *) (info->start[0]);
        volatile CONFIG_SYS_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)) {


@@ -427,8 +427,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();
 


@@ -454,7 +452,6 @@ int flash_erase(flash_info_t * info, int s_first, int s_last)
                                addr[CONFIG_SYS_FLASH_ADDR1] = (CONFIG_SYS_FLASH_WORD_SIZE) 0x00550055;
                                addr2[0] = (CONFIG_SYS_FLASH_WORD_SIZE) 0x00300030;     /* sector erase */
                        }
                                addr[CONFIG_SYS_FLASH_ADDR1] = (CONFIG_SYS_FLASH_WORD_SIZE) 0x00550055;
                                addr2[0] = (CONFIG_SYS_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


@@ -825,7 +822,7 @@ static int flash_erase_2(flash_info_t * info, int s_first, int s_last)
 {
        volatile CONFIG_SYS_FLASH_WORD_SIZE *addr = (CONFIG_SYS_FLASH_WORD_SIZE *) (info->start[0]);
        volatile CONFIG_SYS_FLASH_WORD_SIZE *addr2;
 {
        volatile CONFIG_SYS_FLASH_WORD_SIZE *addr = (CONFIG_SYS_FLASH_WORD_SIZE *) (info->start[0]);
        volatile CONFIG_SYS_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)) {


@@ -856,8 +853,6 @@ static int flash_erase_2(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();
 


@@ -883,7 +878,6 @@ static int flash_erase_2(flash_info_t * info, int s_first, int s_last)
                                addr[CONFIG_SYS_FLASH_ADDR1] = (CONFIG_SYS_FLASH_WORD_SIZE) 0x00550055;
                                addr2[0] = (CONFIG_SYS_FLASH_WORD_SIZE) 0x00300030;     /* sector erase */
                        }
                                addr[CONFIG_SYS_FLASH_ADDR1] = (CONFIG_SYS_FLASH_WORD_SIZE) 0x00550055;
                                addr2[0] = (CONFIG_SYS_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