mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 01/20] scripts: imx-image: Only set DCD pointer when we have DCD data
Date: Tue, 23 Jun 2020 15:15:47 +0200	[thread overview]
Message-ID: <20200623131606.16316-2-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20200623131606.16316-1-s.hauer@pengutronix.de>

When we do not have any DCD data we can set the pointer to the
data to NULL.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 scripts/imx/imx-image.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
index ec7444a772..2481ae6403 100644
--- a/scripts/imx/imx-image.c
+++ b/scripts/imx/imx-image.c
@@ -329,7 +329,8 @@ static size_t add_header_v2(const struct config_data *data, void *buf)
 	hdr->header.version	= IVT_VERSION;
 
 	hdr->entry		= loadaddr + HEADER_LEN;
-	hdr->dcd_ptr		= loadaddr + offset + offsetof(struct imx_flash_header_v2, dcd_header);
+	if (dcdsize)
+		hdr->dcd_ptr = loadaddr + offset + offsetof(struct imx_flash_header_v2, dcd_header);
 	if (create_usb_image) {
 		dcd_ptr_content = hdr->dcd_ptr;
 		dcd_ptr_offset = offsetof(struct imx_flash_header_v2, dcd_ptr) + offset;
@@ -357,13 +358,14 @@ static size_t add_header_v2(const struct config_data *data, void *buf)
 		hdr->boot_data.size += CSF_LEN;
 	}
 
-	hdr->dcd_header.tag	= TAG_DCD_HEADER;
-	hdr->dcd_header.length	= htobe16(sizeof(uint32_t) + dcdsize);
-	hdr->dcd_header.version	= DCD_VERSION;
-
 	buf += sizeof(*hdr);
 
-	memcpy(buf, dcdtable, dcdsize);
+	if (dcdsize) {
+		hdr->dcd_header.tag	= TAG_DCD_HEADER;
+		hdr->dcd_header.length	= htobe16(sizeof(uint32_t) + dcdsize);
+		hdr->dcd_header.version	= DCD_VERSION;
+		memcpy(buf, dcdtable, dcdsize);
+	}
 
 	return imagesize;
 }
-- 
2.27.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2020-06-23 13:16 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-23 13:15 [PATCH 00/20] i.MX8MP support Sascha Hauer
2020-06-23 13:15 ` Sascha Hauer [this message]
2020-06-23 13:15 ` [PATCH 02/20] scripts: imx-image: exit on read/write failures Sascha Hauer
2020-06-23 13:15 ` [PATCH 03/20] scripts: imx-image: Add extra code path for i.MX35 Sascha Hauer
2020-06-23 13:15 ` [PATCH 04/20] scripts: imx-image: exit with error when barebox header conflicts with IVT Sascha Hauer
2020-06-23 13:15 ` [PATCH 05/20] scripts: imx-image: Fix writing image with IVT offset = 0 Sascha Hauer
2020-06-23 13:15 ` [PATCH 06/20] scripts: imx-image: rename image_dcd_offset to image_ivt_offset Sascha Hauer
2020-06-23 13:15 ` [PATCH 07/20] scripts: imx-image: rename dcdofs to ivtofs Sascha Hauer
2020-06-23 13:15 ` [PATCH 08/20] serial: i.MX: Add i.MX8MP compatible Sascha Hauer
2020-06-23 13:15 ` [PATCH 09/20] pinctrl: imx-iomux-v3: " Sascha Hauer
2020-06-23 13:15 ` [PATCH 10/20] net: fec_imx: add fsl,imx8mp-fec compatible Sascha Hauer
2020-06-23 13:15 ` [PATCH 11/20] mci: imx-esdhc: Add i.MX8mp compatible Sascha Hauer
2020-06-23 13:15 ` [PATCH 12/20] arm: imx: add initial imx8mp support Sascha Hauer
2020-06-23 13:15 ` [PATCH 13/20] scripts: imx-image: Add i.MX8MP support Sascha Hauer
2020-06-23 13:16 ` [PATCH 14/20] mfd: Add pca9440 register map Sascha Hauer
2020-06-23 13:16 ` [PATCH 15/20] clk: imx: Add imx8mp clk driver Sascha Hauer
2020-06-23 13:16 ` [PATCH 16/20] mci: imx-esdhc-pbl: Add imx8mp_esdhc_load_image() for i.MX8MP Sascha Hauer
2020-06-23 13:16 ` [PATCH 17/20] net: phy: realtek: handle RX delay setting Sascha Hauer
2020-06-23 13:16 ` [PATCH 18/20] ARM: i.MX: bbu: Fix IVT offset for i.MX8MP Sascha Hauer
2020-06-23 13:16 ` [PATCH 19/20] ARM: i.MX8MP: Add ocotp support Sascha Hauer
2020-06-23 13:16 ` [PATCH 20/20] arm: boards: add initial imx8mp-evk support Sascha Hauer

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=20200623131606.16316-2-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox