Merge git://www.denx.de/git/u-boot-cfi-flash

This commit is contained in:
Tom Rini 2016-04-13 08:27:49 -04:00
commit 3f8085e94a

View file

@ -979,7 +979,7 @@ static int flash_write_cfibuffer (flash_info_t * info, ulong dest, uchar * cp,
case CFI_CMDSET_AMD_STANDARD: case CFI_CMDSET_AMD_STANDARD:
case CFI_CMDSET_AMD_EXTENDED: case CFI_CMDSET_AMD_EXTENDED:
flash_unlock_seq(info,0); flash_unlock_seq(info, sector);
#ifdef CONFIG_FLASH_SPANSION_S29WS_N #ifdef CONFIG_FLASH_SPANSION_S29WS_N
offset = ((unsigned long)dst - info->start[sector]) >> shift; offset = ((unsigned long)dst - info->start[sector]) >> shift;