Commit a7292871 authored by Jens Gehrlein's avatar Jens Gehrlein Committed by Stefan Roese

CFI: avoid redundant function call in single word programming mode

The function find_sector() doesn't need to be called twice in
the case of AMD command set.
Tested on TQM5200S-BD with Samsung K8P2815UQB.
Signed-off-by: default avatarJens Gehrlein <>
Signed-off-by: default avatarStefan Roese <>
parent 8f86a363
......@@ -795,7 +795,8 @@ static int flash_write_cfiword (flash_info_t * info, ulong dest,
void *dstaddr;
int flag;
flash_sect_t sect;
flash_sect_t sect = 0;
char sect_found = 0;
dstaddr = map_physmem(dest, info->portwidth, MAP_NOCACHE);
......@@ -840,6 +841,7 @@ static int flash_write_cfiword (flash_info_t * info, ulong dest,
sect = find_sector(info, dest);
flash_unlock_seq (info, sect);
flash_write_cmd (info, sect, info->addr_unlock1, AMD_CMD_WRITE);
sect_found = 1;
......@@ -864,8 +866,10 @@ static int flash_write_cfiword (flash_info_t * info, ulong dest,
unmap_physmem(dstaddr, info->portwidth);
return flash_full_status_check (info, find_sector (info, dest),
info->write_tout, "write");
if (!sect_found)
sect = find_sector (info, dest);
return flash_full_status_check (info, sect, info->write_tout, "write");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment