board/amcc/yucca/flash.c: Fix GCC 4.6 build warnings
Fix: flash.c: In function 'flash_erase_1': flash.c:425:24: warning: variable 'l_sect' set but not used [-Wunused-but-set-variable] flash.c: In function 'flash_erase_2': flash.c:834: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>
This commit is contained in:
parent
9879d57203
commit
2975fe14d9
|
@ -422,7 +422,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 *addr = (CONFIG_SYS_FLASH_WORD_SIZE *) (info->start[0]);
|
||||||
volatile CONFIG_SYS_FLASH_WORD_SIZE *addr2;
|
volatile CONFIG_SYS_FLASH_WORD_SIZE *addr2;
|
||||||
int flag, prot, sect, l_sect;
|
int flag, prot, sect;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if ((s_first < 0) || (s_first > s_last)) {
|
if ((s_first < 0) || (s_first > s_last)) {
|
||||||
|
@ -449,8 +449,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 */
|
/* Disable interrupts which might cause a timeout here */
|
||||||
flag = disable_interrupts();
|
flag = disable_interrupts();
|
||||||
|
|
||||||
|
@ -476,7 +474,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;
|
addr[CONFIG_SYS_FLASH_ADDR1] = (CONFIG_SYS_FLASH_WORD_SIZE) 0x00550055;
|
||||||
addr2[0] = (CONFIG_SYS_FLASH_WORD_SIZE) 0x00300030; /* sector erase */
|
addr2[0] = (CONFIG_SYS_FLASH_WORD_SIZE) 0x00300030; /* sector erase */
|
||||||
}
|
}
|
||||||
l_sect = sect;
|
|
||||||
/*
|
/*
|
||||||
* Wait for each sector to complete, it's more
|
* Wait for each sector to complete, it's more
|
||||||
* reliable. According to AMD Spec, you must
|
* reliable. According to AMD Spec, you must
|
||||||
|
@ -831,7 +828,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 *addr = (CONFIG_SYS_FLASH_WORD_SIZE *) (info->start[0]);
|
||||||
volatile CONFIG_SYS_FLASH_WORD_SIZE *addr2;
|
volatile CONFIG_SYS_FLASH_WORD_SIZE *addr2;
|
||||||
int flag, prot, sect, l_sect;
|
int flag, prot, sect;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if ((s_first < 0) || (s_first > s_last)) {
|
if ((s_first < 0) || (s_first > s_last)) {
|
||||||
|
@ -858,8 +855,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 */
|
/* Disable interrupts which might cause a timeout here */
|
||||||
flag = disable_interrupts();
|
flag = disable_interrupts();
|
||||||
|
|
||||||
|
@ -885,7 +880,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;
|
addr[CONFIG_SYS_FLASH_ADDR1] = (CONFIG_SYS_FLASH_WORD_SIZE) 0x00550055;
|
||||||
addr2[0] = (CONFIG_SYS_FLASH_WORD_SIZE) 0x00300030; /* sector erase */
|
addr2[0] = (CONFIG_SYS_FLASH_WORD_SIZE) 0x00300030; /* sector erase */
|
||||||
}
|
}
|
||||||
l_sect = sect;
|
|
||||||
/*
|
/*
|
||||||
* Wait for each sector to complete, it's more
|
* Wait for each sector to complete, it's more
|
||||||
* reliable. According to AMD Spec, you must
|
* reliable. According to AMD Spec, you must
|
||||||
|
|
Loading…
Reference in New Issue