mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH v5 51/54] scripts: imx-image: Share the code to write barebox header
Date: Tue, 12 Jun 2018 13:53:07 -0700	[thread overview]
Message-ID: <20180612205310.25745-52-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180612205310.25745-1-andrew.smirnov@gmail.com>

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 scripts/imx/imx-image.c | 42 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
index bc1f821bd..4a08581fb 100644
--- a/scripts/imx/imx-image.c
+++ b/scripts/imx/imx-image.c
@@ -36,6 +36,7 @@
 #include <include/filetype.h>
 
 #define FLASH_HEADER_OFFSET 0x400
+#define ARM_HEAD_SIZE_INDEX	(ARM_HEAD_SIZE_OFFSET / sizeof(uint32_t))
 
 /*
  * Conservative DCD element limit set to restriction v2 header size to
@@ -46,7 +47,6 @@
 
 static uint32_t dcdtable[MAX_DCD];
 static int curdcd;
-static int add_barebox_header;
 static int create_usb_image;
 static char *prgname;
 
@@ -207,18 +207,14 @@ static int add_srk(void *buf, int offset, uint32_t loadaddr, const char *srkfile
 static int dcd_ptr_offset;
 static uint32_t dcd_ptr_content;
 
-static int add_header_v1(struct config_data *data, void *buf)
+static size_t add_header_v1(struct config_data *data, void *buf)
 {
 	struct imx_flash_header *hdr;
 	int dcdsize = curdcd * sizeof(uint32_t);
-	uint32_t *psize = buf + ARM_HEAD_SIZE_OFFSET;
 	int offset = data->image_dcd_offset;
 	uint32_t loadaddr = data->image_load_addr;
 	uint32_t imagesize = data->load_size;
 
-	if (add_barebox_header)
-		memcpy(buf, bb_header, sizeof(bb_header));
-
 	buf += offset;
 	hdr = buf;
 
@@ -250,12 +246,9 @@ static int add_header_v1(struct config_data *data, void *buf)
 		imagesize += CSF_LEN;
 	}
 
-	if (add_barebox_header)
-		*psize = imagesize;
-
 	*(uint32_t *)buf = imagesize;
 
-	return 0;
+	return imagesize;
 }
 
 static int write_mem_v1(uint32_t addr, uint32_t val, int width, int set_bits, int clear_bits)
@@ -283,18 +276,14 @@ static int write_mem_v1(uint32_t addr, uint32_t val, int width, int set_bits, in
  * ============================================================================
  */
 
-static int add_header_v2(const struct config_data *data, void *buf)
+static size_t add_header_v2(const struct config_data *data, void *buf)
 {
 	struct imx_flash_header_v2 *hdr;
 	int dcdsize = curdcd * sizeof(uint32_t);
-	uint32_t *psize = buf + ARM_HEAD_SIZE_OFFSET;
 	int offset = data->image_dcd_offset;
 	uint32_t loadaddr = data->image_load_addr;
 	uint32_t imagesize = data->load_size;
 
-	if (add_barebox_header)
-		memcpy(buf, bb_header, sizeof(bb_header));
-
 	buf += offset;
 	hdr = buf;
 
@@ -320,9 +309,6 @@ static int add_header_v2(const struct config_data *data, void *buf)
 		hdr->boot_data.size += CSF_LEN;
 	}
 
-	if (add_barebox_header)
-		*psize = hdr->boot_data.size;
-
 	hdr->dcd_header.tag	= TAG_DCD_HEADER;
 	hdr->dcd_header.length	= htobe16(sizeof(uint32_t) + dcdsize);
 	hdr->dcd_header.version	= DCD_VERSION;
@@ -331,7 +317,7 @@ static int add_header_v2(const struct config_data *data, void *buf)
 
 	memcpy(buf, dcdtable, dcdsize);
 
-	return 0;
+	return imagesize;
 }
 
 static void usage(const char *prgname)
@@ -680,6 +666,8 @@ int main(int argc, char *argv[])
 	int now = 0;
 	int sign_image = 0;
 	int i, header_copies;
+	int add_barebox_header;
+	uint32_t barebox_image_size;
 	struct config_data data = {
 		.image_dcd_offset = 0xffffffff,
 		.write_mem = write_mem,
@@ -792,7 +780,7 @@ int main(int argc, char *argv[])
 
 	switch (data.header_version) {
 	case 1:
-		add_header_v1(&data, buf);
+		barebox_image_size = add_header_v1(&data, buf);
 		if (data.srkfile) {
 			ret = add_srk(buf, data.image_dcd_offset, data.image_load_addr,
 				      data.srkfile);
@@ -807,7 +795,7 @@ int main(int argc, char *argv[])
 			exit(1);
 		}
 
-		add_header_v2(&data, buf);
+		barebox_image_size = add_header_v2(&data, buf);
 		break;
 	default:
 		fprintf(stderr, "Congratulations! You're welcome to implement header version %d\n",
@@ -815,6 +803,8 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
+	bb_header[ARM_HEAD_SIZE_INDEX] = barebox_image_size;
+
 	infile = read_file(imagename, &insize);
 	if (!infile)
 		exit(1);
@@ -828,7 +818,15 @@ int main(int argc, char *argv[])
 	header_copies = (data.cpu_type == IMX_CPU_IMX35) ? 2 : 1;
 
 	for (i = 0; i < header_copies; i++) {
-		ret = xwrite(outfd, buf, HEADER_LEN);
+		ret = xwrite(outfd, add_barebox_header ? bb_header : buf,
+			     sizeof(bb_header));
+		if (ret < 0) {
+			perror("write");
+			exit(1);
+		}
+
+		ret = xwrite(outfd, buf + sizeof(bb_header),
+			     HEADER_LEN - sizeof(bb_header));
 		if (ret < 0) {
 			perror("write");
 			exit(1);
-- 
2.17.0


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

  parent reply	other threads:[~2018-06-12 20:55 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-12 20:52 [PATCH v5 00/54] ARM: i.MX8MQ and EVK support Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 01/54] ARM: i.MX: xload: Fix compiler warning Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 02/54] ARM: i.MX: compile arm32 specific errata only for CPU32 Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 03/54] ARM: Add i.MX8 support Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 04/54] aarch64: Add i.MX8 debug UART support Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 05/54] Include our own include/dt-bindings Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 06/54] mci: imx-esdhc: use dma mapping functions Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 07/54] net: fec_imx: remove unnecessary DMA sync ops Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 08/54] net: fec_imx: Use dma mapping functions Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 09/54] net: fec_imx: Make use of IS_ALIGNED Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 10/54] clock: Add i.MX8MQ clock driver Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 11/54] serial: i.MX: Add i.MX8 support Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 12/54] mmc: i.MX esdhc: " Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 13/54] gpio: i.MX: Add i.MX8mq support Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 14/54] ARM: i.MX: ocotp: Add i.MX8MQ support Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 15/54] ARM: i.MX: Split shared CCM code into a separate file Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 16/54] ARM: i.MX: Add IOMUX pad constants for i.MX8 Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 17/54] ARM: i.MX: Add basic CCM " Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 18/54] ARM: Add constants and helpers for system counter interface Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 19/54] clocksource: armv8-timer: Convert explicit assembly into helpers Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 20/54] ARM: i.MX8: Initialize system counter Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 21/54] ARM: i.MX: boot: Fix address casting on 64-bit platforms Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 22/54] ARM: boot: Add trivial i.MX8 support Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 23/54] ARM: i.MX: xload-esdhc: Rework to make code be less i.MX6-specific Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 24/54] ARM: i.MX: xload-esdhc: Allow custom buffer address, device offset Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 25/54] ARM: i.MX: xload-esdhc: Add support for i.MX8 Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 26/54] pinctrl: i.MX: " Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 27/54] Documentation: imx: Change block size for 'dd' to 1024 Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 28/54] Documentation: i.MX: Add missing <soctype> Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 29/54] clocksource: armv8-timer: Make armv8_clocksource_read() static Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 30/54] clocksource: armv8-timer: Make use of postcore_platform_driver() Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 31/54] Port <linux/iopoll.h> from U-Boot Andrey Smirnov
2018-06-13  8:12   ` Sascha Hauer
2018-06-13 12:29     ` Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 32/54] common/clock: Move delay and timeout functions to lib/ Andrey Smirnov
2018-06-13  8:19   ` Sascha Hauer
2018-06-13 12:26     ` Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 33/54] clock: Use udelay() to implement mdelay() Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 34/54] ARM: i.MX8: Add DDRC PHY and DDR CTL base addresses Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 35/54] Kbuild: Add $(quote) Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 36/54] Add builtin firmware support Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 37/54] ARM: i.MX8: Add DDRC PHY support code Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 38/54] ARM: Specify HAVE_PBL_IMAGE for CPU_64 Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 39/54] ARM: lib64: Make string functions aware of MMU configuration Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 40/54] ARM: mmu: Make use of dsb() and isb() helpers Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 41/54] ARM: cache: Remove unused cache ops struct Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 42/54] ARM: no-mmu: Disable building for ARMv8 Andrey Smirnov
2018-06-12 20:52 ` [PATCH v5 43/54] ARM: interrupts64: Include ESR value in exception traceback Andrey Smirnov
2018-06-12 20:53 ` [PATCH v5 44/54] ARM: mmu64: Trivial code simplification Andrey Smirnov
2018-06-12 20:53 ` [PATCH v5 45/54] ARM: mmu64: Make use of create_table() Andrey Smirnov
2018-06-12 20:53 ` [PATCH v5 46/54] ARM: mmu64: Convert flags in arch_remap_range() Andrey Smirnov
2018-06-12 20:53 ` [PATCH v5 47/54] ARM: include: dma: Add missing no-MMU stubs Andrey Smirnov
2018-06-12 20:53 ` [PATCH v5 48/54] scripts: imx-image: Drop error return from write_dcd() Andrey Smirnov
2018-06-12 20:53 ` [PATCH v5 49/54] scripts: imx-image: Limit v2 header size to HEADER_LEN Andrey Smirnov
2018-06-12 20:53 ` [PATCH v5 50/54] scripts: imx-image: Use a loop to create multiple header copies Andrey Smirnov
2018-06-12 20:53 ` Andrey Smirnov [this message]
2018-06-12 20:53 ` [PATCH v5 52/54] scripts: imx-image: Add i.MX8MQ support Andrey Smirnov
2018-06-12 20:53 ` [PATCH v5 53/54] ARM: i.MX8: Add i.MX8mq EVK support Andrey Smirnov
2018-06-13  8:49   ` Christian Hemp
2018-06-13 12:33     ` Andrey Smirnov
2018-06-12 20:53 ` [PATCH v5 54/54] ARM: Introduce imx_v8_defconfig Andrey Smirnov
2018-06-13  8:24 ` [PATCH v5 00/54] ARM: i.MX8MQ and EVK support Sascha Hauer
2018-06-13 12:29   ` Andrey Smirnov

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=20180612205310.25745-52-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --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