From: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Date: Mon, 17 Apr 2017 15:48:03 +0000 (+0200)
Subject: rockchip: mkimage: rksd: pad SD/MMC images to a full blocksize
X-Git-Tag: v2017.07-rc1~356^2~44
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c25b8c3af108019303364bc304a80e3f83209dc6;p=u-boot

rockchip: mkimage: rksd: pad SD/MMC images to a full blocksize

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: Simon Glass <sjg@chromium.org>
---

diff --git a/tools/rksd.c b/tools/rksd.c
index 6dafedf282..8627b6d31b 100644
--- a/tools/rksd.c
+++ b/tools/rksd.c
@@ -62,8 +62,11 @@ static int rksd_check_image_type(uint8_t type)
 static int rksd_vrec_header(struct image_tool_params *params,
 			    struct image_type_params *tparams)
 {
-	/* We don't add any additional padding after the end of the image */
-	return rkcommon_vrec_header(params, tparams, 1);
+	/*
+	 * Pad to the RK_BLK_SIZE (512 bytes) to be consistent with init_size
+	 * being encoded in RK_BLK_SIZE units in header0 (see rkcommon.c).
+	 */
+	return rkcommon_vrec_header(params, tparams, RK_BLK_SIZE);
 }
 
 /*