From: Rob Herring <robh@kernel.org>
Date: Thu, 16 Oct 2014 03:19:36 +0000 (+0800)
Subject: aboot: fix block addressing for don't care chunk type
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9981945;p=project%2Fbcm63xx%2Fu-boot.git

aboot: fix block addressing for don't care chunk type

CHUNK_TYPE_DONT_CARE should skip over the specified number of blocks, but
currently fails to increment the device block address. This results in
filesystem images getting written incorrectly. Add the missing block
address incrementing.

Cc: Steve Rae <srae@broadcom.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Steve Rae <srae@broadcom.com>
---

diff --git a/common/aboot.c b/common/aboot.c
index d5c464bd7d..fba8e3e683 100644
--- a/common/aboot.c
+++ b/common/aboot.c
@@ -208,6 +208,7 @@ void write_sparse_image(block_dev_desc_t *dev_desc,
 			break;
 
 			case CHUNK_TYPE_DONT_CARE:
+			blk += blkcnt;
 			total_blocks += chunk_header->chunk_sz;
 			break;