leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-spi

Browse Source
This commit is contained in:
Tom Rini
2015-04-28 07:28:43 -04:00
parent 86e6f7eaa1 c650ca7b4c
commit cc555bd4f4
14 changed files with 93 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/cmd_sf.c
View File

@@ -164,6 +164,8 @@ static int do_spi_flash_probe(int argc, char * const argv[])
static const char *spi_flash_update_block(struct spi_flash *flash, u32 offset,
size_t len, const char *buf, char *cmp_buf, size_t *skipped)
{
char *ptr = (char *)buf;
debug("offset=%#x, sector_size=%#x, len=%#zx\n",
offset, flash->sector_size, len);
/* Read the entire sector so to allow for rewriting */
@@ -179,16 +181,14 @@ static const char *spi_flash_update_block(struct spi_flash *flash, u32 offset,
/* Erase the entire sector */
if (spi_flash_erase(flash, offset, flash->sector_size))
return "erase";
/* Write the initial part of the block from the source */
if (spi_flash_write(flash, offset, len, buf))
return "write";
/* If it's a partial sector, rewrite the existing part */
/* If it's a partial sector, copy the data into the temp-buffer */
if (len != flash->sector_size) {
/* Rewrite the original data to the end of the sector */
if (spi_flash_write(flash, offset + len,
flash->sector_size - len, &cmp_buf[len]))
return "write";
memcpy(cmp_buf, buf, len);
ptr = cmp_buf;
}
/* Write one complete sector */
if (spi_flash_write(flash, offset, flash->sector_size, ptr))
return "write";
return NULL;
}