Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
This commit is contained in:
commit
227ad917c5
|
@ -835,14 +835,19 @@ static int flash_write_cfiword (flash_info_t * info, ulong dest,
|
||||||
break;
|
break;
|
||||||
case CFI_CMDSET_AMD_EXTENDED:
|
case CFI_CMDSET_AMD_EXTENDED:
|
||||||
case CFI_CMDSET_AMD_STANDARD:
|
case CFI_CMDSET_AMD_STANDARD:
|
||||||
#ifdef CONFIG_FLASH_CFI_LEGACY
|
|
||||||
case CFI_CMDSET_AMD_LEGACY:
|
|
||||||
#endif
|
|
||||||
sect = find_sector(info, dest);
|
sect = find_sector(info, dest);
|
||||||
flash_unlock_seq (info, sect);
|
flash_unlock_seq (info, sect);
|
||||||
flash_write_cmd (info, sect, info->addr_unlock1, AMD_CMD_WRITE);
|
flash_write_cmd (info, sect, info->addr_unlock1, AMD_CMD_WRITE);
|
||||||
sect_found = 1;
|
sect_found = 1;
|
||||||
break;
|
break;
|
||||||
|
#ifdef CONFIG_FLASH_CFI_LEGACY
|
||||||
|
case CFI_CMDSET_AMD_LEGACY:
|
||||||
|
sect = find_sector(info, dest);
|
||||||
|
flash_unlock_seq (info, 0);
|
||||||
|
flash_write_cmd (info, 0, info->addr_unlock1, AMD_CMD_WRITE);
|
||||||
|
sect_found = 1;
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (info->portwidth) {
|
switch (info->portwidth) {
|
||||||
|
|
Loading…
Reference in New Issue