diff options
| author | Steve Rae | 2016-02-09 11:19:10 -0800 |
|---|---|---|
| committer | Tom Rini | 2016-04-11 20:48:29 -0400 |
| commit | c7529dbad1722bd6d6ef2a0af0e818902a296d64 (patch) | |
| tree | c8e066dafe3d834044c453ad28a1a73c3af8f9cf /common/image-sparse.c | |
| parent | 5fee9489f6e361219790c92dfaa9f27aaf8bf5a9 (diff) | |
fastboot: sparse: fix block addressing for don't care chunk type
When 7bfc3b1 (sparse: Refactor chunk parsing function) was implemented,
it dropped 9981945 (aboot: fix block addressing for don't care chunk type).
This re-implements the required fix for the "don't care chunk type"...
Signed-off-by: Steve Rae <srae@broadcom.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'common/image-sparse.c')
| -rw-r--r-- | common/image-sparse.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/common/image-sparse.c b/common/image-sparse.c index 2433192b20e..e0d87617c97 100644 --- a/common/image-sparse.c +++ b/common/image-sparse.c @@ -331,9 +331,13 @@ int store_sparse_image(sparse_storage_t *storage, void *storage_priv, * and go on parsing the rest of the chunks */ if (chunk_header->chunk_type == CHUNK_TYPE_DONT_CARE) { - skipped += sparse_block_size_to_storage(chunk_header->chunk_sz, - storage, - sparse_header); + blkcnt = sparse_block_size_to_storage(chunk_header->chunk_sz, + storage, + sparse_header); +#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV + total_blocks += blkcnt; +#endif + skipped += blkcnt; continue; } @@ -381,7 +385,7 @@ int store_sparse_image(sparse_storage_t *storage, void *storage_priv, printf("........ wrote %d blocks to '%s'\n", total_blocks, storage->name); - if ((total_blocks + skipped) != + if (total_blocks != sparse_block_size_to_storage(sparse_header->total_blks, storage, sparse_header)) { printf("sparse image write failure\n"); |