V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

CFI: cfi_flash write fix for AMD legacy 

The flash_unlock_seq requires a sector for AMD_LEGACY.
Fix a retcode check typeo.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Ed Swarthout 2008-10-09 01:26:36 -05:00 committed by Stefan Roese
parent df4a0796e8
commit 0d01f66d23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mtd/cfi_flash.c
View File

@ -681,7 +681,7 @@ static int flash_full_status_check (flash_info_t * info, flash_sect_t sector,
case CFI_CMDSET_INTEL_PROG_REGIONS: case CFI_CMDSET_INTEL_PROG_REGIONS:
case CFI_CMDSET_INTEL_EXTENDED: case CFI_CMDSET_INTEL_EXTENDED:
case CFI_CMDSET_INTEL_STANDARD: case CFI_CMDSET_INTEL_STANDARD:
if ((retcode == ERR_OK) if ((retcode != ERR_OK)
&& !flash_isequal (info, sector, 0, FLASH_STATUS_DONE)) { && !flash_isequal (info, sector, 0, FLASH_STATUS_DONE)) {
retcode = ERR_INVAL; retcode = ERR_INVAL;
printf ("Flash %s error at address %lx\n", prompt, printf ("Flash %s error at address %lx\n", prompt,
@ -777,6 +777,7 @@ static int flash_write_cfiword (flash_info_t * info, ulong dest,
{ {
void *dstaddr; void *dstaddr;
int flag; int flag;
flash_sect_t sect;
dstaddr = map_physmem(dest, info->portwidth, MAP_NOCACHE); dstaddr = map_physmem(dest, info->portwidth, MAP_NOCACHE);
@ -818,8 +819,9 @@ static int flash_write_cfiword (flash_info_t * info, ulong dest,
#ifdef CONFIG_FLASH_CFI_LEGACY #ifdef CONFIG_FLASH_CFI_LEGACY
case CFI_CMDSET_AMD_LEGACY: case CFI_CMDSET_AMD_LEGACY:
#endif #endif
flash_unlock_seq (info, 0); sect = find_sector(info, dest);
flash_write_cmd (info, 0, info->addr_unlock1, AMD_CMD_WRITE); flash_unlock_seq (info, sect);
flash_write_cmd (info, sect, info->addr_unlock1, AMD_CMD_WRITE);
break; break;
} }