From: Daniel Kochmański <dkochmanski@turtle-solutions.eu>
Date: Tue, 26 May 2015 15:00:39 +0000 (+0200)
Subject: sunxi/nand: change BLOCK_SIZE in mksunxiboot to match NAND block size
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=1f6f61fe4c7c9637e2c8b2960a08f106fbe01134;p=u-boot.git

sunxi/nand: change BLOCK_SIZE in mksunxiboot to match NAND block size

This change is necessary to calculate correct checksum for NAND
boot. Works both for MMC and NAND. Without it BROM rejects boot image
as invalid (bad checksum). (Changes block size from 0x200 to 0x2000).

Signed-off-by: Daniel Kochmański <dkochmanski@turtle-solutions.eu>
Signed-off-by: Roy Spliet <r.spliet@ultimaker.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---

diff --git a/tools/mksunxiboot.c b/tools/mksunxiboot.c
index 0035f6ea26..3361251c8e 100644
--- a/tools/mksunxiboot.c
+++ b/tools/mksunxiboot.c
@@ -65,7 +65,13 @@ int gen_check_sum(struct boot_file_head *head_p)
 
 #define SUN4I_SRAM_SIZE 0x7600	/* 0x7748+ is used by BROM */
 #define SRAM_LOAD_MAX_SIZE (SUN4I_SRAM_SIZE - sizeof(struct boot_file_head))
-#define BLOCK_SIZE 512
+
+/*
+ * BROM (at least on A10 and A20) requires NAND-images to be explicitly aligned
+ * to a multiple of 8K, and rejects the image otherwise. MMC-images are fine
+ * with 512B blocks. To cater for both, align to the largest of the two.
+ */
+#define BLOCK_SIZE 0x2000
 
 struct boot_img {
 	struct boot_file_head header;