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 <s...@broadcom.com>
---
common/image-sparse.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/common/image-sparse.c b/common/image-sparse.c
index dffe844..f02aee4 100644
--- a/common/image-sparse.c
+++ b/common/image-sparse.c
@@ -330,9 +330,11 @@ 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);
+ total_blocks += blkcnt;
+ skipped += blkcnt;
continue;
}
@@ -380,7 +382,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");
--
1.8.5
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
