All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michal Simek <michal.simek@xilinx.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/3] tools: zynqimage: Align image_size/image_stored_size
Date: Tue, 15 Jan 2019 14:19:25 +0100	[thread overview]
Message-ID: <c2d1dde15556837c61f940f470225aec2bb0e25c.1547558364.git.michal.simek@xilinx.com> (raw)

Bootrom is not capable to work with non aligned bootloader sizes.
SPL with OF_SEPARATE generates non-align images quite often that's
why this change is required before OF_SEPARATE enableding.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 tools/zynqmpbif.c   | 4 ++--
 tools/zynqmpimage.c | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/zynqmpbif.c b/tools/zynqmpbif.c
index a33c15e1f018..8c47107c7b94 100644
--- a/tools/zynqmpbif.c
+++ b/tools/zynqmpbif.c
@@ -425,8 +425,8 @@ static int bif_add_part(struct bif_entry *bf, const char *data, size_t len)
 		if (!bif_output.header->image_offset)
 			bif_output.header->image_offset =
 				cpu_to_le32(bf->offset);
-		bif_output.header->image_size = cpu_to_le32(len);
-		bif_output.header->image_stored_size = cpu_to_le32(len);
+		bif_output.header->image_size = cpu_to_le32(len_padded);
+		bif_output.header->image_stored_size = cpu_to_le32(len_padded);
 
 		bif_output.header->image_attributes &= ~HEADER_CPU_SELECT_MASK;
 		switch (bf->dest_cpu) {
diff --git a/tools/zynqmpimage.c b/tools/zynqmpimage.c
index 19b2f02ff150..67032aa7b23c 100644
--- a/tools/zynqmpimage.c
+++ b/tools/zynqmpimage.c
@@ -411,6 +411,7 @@ static void zynqmpimage_set_header(void *ptr, struct stat *sbuf, int ifd,
 		cpu_to_le32((uint32_t)sizeof(struct zynqmp_header));
 	zynqhdr->image_size = cpu_to_le32(params->file_size -
 					  sizeof(struct zynqmp_header));
+	zynqhdr->image_size = ROUND(zynqhdr->image_size, 4);
 	zynqhdr->image_stored_size = zynqhdr->image_size;
 	zynqhdr->image_load = 0xfffc0000;
 	if (params->eflag)
-- 
1.9.1

             reply	other threads:[~2019-01-15 13:19 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-15 13:19 Michal Simek [this message]
2019-01-15 13:19 ` [U-Boot] [PATCH 2/3] arm64: zynqmp: Convert all reference boards to OF_SEPARATE Michal Simek
2019-01-15 13:19 ` [U-Boot] [PATCH 3/3] ARM: zynq: Convert all " Michal Simek
2019-01-16 11:20 ` [U-Boot] [PATCH 1/3] tools: zynqimage: Align image_size/image_stored_size Michal Simek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c2d1dde15556837c61f940f470225aec2bb0e25c.1547558364.git.michal.simek@xilinx.com \
    --to=michal.simek@xilinx.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.