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 v4 52/54] scripts: imx-image: Add i.MX8MQ support
Date: Mon, 11 Jun 2018 18:53:24 -0700	[thread overview]
Message-ID: <20180612015326.26192-53-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180612015326.26192-1-andrew.smirnov@gmail.com>

From: Sascha Hauer <s.hauer@pengutronix.de>

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 scripts/imx/imx-image.c | 54 +++++++++++++++++++++++++++++++++++++----
 scripts/imx/imx.c       | 23 ++++++++++++------
 scripts/imx/imx.h       |  2 ++
 3 files changed, 66 insertions(+), 13 deletions(-)

diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
index 4a08581fb..6ebae2256 100644
--- a/scripts/imx/imx-image.c
+++ b/scripts/imx/imx-image.c
@@ -57,8 +57,7 @@ static char *prgname;
  */
 
 
-static uint32_t bb_header[] = {
-	0xea0003fe,	/* b 0x1000 */
+static uint32_t bb_header_aarch32[] = {
 	0xeafffffe,	/* 1: b 1b  */
 	0xeafffffe,	/* 1: b 1b  */
 	0xeafffffe,	/* 1: b 1b  */
@@ -66,6 +65,30 @@ static uint32_t bb_header[] = {
 	0xeafffffe,	/* 1: b 1b  */
 	0xeafffffe,	/* 1: b 1b  */
 	0xeafffffe,	/* 1: b 1b  */
+	0xeafffffe,	/* 1: b 1b  */
+	0x65726162,	/* 'bare'   */
+	0x00786f62,	/* 'box\0'  */
+	0x00000000,
+	0x00000000,
+	0x55555555,
+	0x55555555,
+	0x55555555,
+	0x55555555,
+	0x55555555,
+	0x55555555,
+	0x55555555,
+	0x55555555,
+};
+
+static uint32_t bb_header_aarch64[] = {
+	0x14000000,	/* 1: b 1b  */
+	0x14000000,	/* 1: b 1b  */
+	0x14000000,	/* 1: b 1b  */
+	0x14000000,	/* 1: b 1b  */
+	0x14000000,	/* 1: b 1b  */
+	0x14000000,	/* 1: b 1b  */
+	0x14000000,	/* 1: b 1b  */
+	0x14000000,	/* 1: b 1b  */
 	0x65726162,	/* 'bare'   */
 	0x00786f62,	/* 'box\0'  */
 	0x00000000,
@@ -652,6 +675,11 @@ static void *read_file(const char *filename, size_t *size)
 	return buf;
 }
 
+static bool cpu_is_aarch64(const struct config_data *data)
+{
+	return data->cpu_type == IMX_CPU_IMX8MQ;
+}
+
 int main(int argc, char *argv[])
 {
 	int opt, ret;
@@ -674,6 +702,8 @@ int main(int argc, char *argv[])
 		.check = check,
 		.nop = nop,
 	};
+	uint32_t *bb_header;
+	size_t sizeof_bb_header;
 
 	prgname = argv[0];
 
@@ -803,6 +833,15 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
+	if (cpu_is_aarch64(&data)) {
+		bb_header = bb_header_aarch64;
+		sizeof_bb_header = sizeof(bb_header_aarch64);
+	} else {
+		bb_header = bb_header_aarch32;
+		sizeof_bb_header = sizeof(bb_header_aarch32);
+	}
+
+	bb_header[0] = data.first_opcode;
 	bb_header[ARM_HEAD_SIZE_INDEX] = barebox_image_size;
 
 	infile = read_file(imagename, &insize);
@@ -819,14 +858,19 @@ int main(int argc, char *argv[])
 
 	for (i = 0; i < header_copies; i++) {
 		ret = xwrite(outfd, add_barebox_header ? bb_header : buf,
-			     sizeof(bb_header));
+			     sizeof_bb_header);
 		if (ret < 0) {
 			perror("write");
 			exit(1);
 		}
 
-		ret = xwrite(outfd, buf + sizeof(bb_header),
-			     HEADER_LEN - sizeof(bb_header));
+		if (lseek(outfd, data.header_gap, SEEK_CUR) < 0) {
+			perror("lseek");
+			exit(1);
+		}
+
+		ret = xwrite(outfd, buf + sizeof_bb_header,
+			     HEADER_LEN - sizeof_bb_header);
 		if (ret < 0) {
 			perror("write");
 			exit(1);
diff --git a/scripts/imx/imx.c b/scripts/imx/imx.c
index fb6ac001e..d3786b6e1 100644
--- a/scripts/imx/imx.c
+++ b/scripts/imx/imx.c
@@ -222,17 +222,22 @@ struct soc_type {
 	char *name;
 	int header_version;
 	int cpu_type;
+	off_t header_gap;
+	uint32_t first_opcode;
 };
 
+#define SZ_32K	(32 * 1024)
+
 static struct soc_type socs[] = {
-	{ .name = "imx25", .header_version = 1, .cpu_type = IMX_CPU_IMX25 },
-	{ .name = "imx35", .header_version = 1, .cpu_type = IMX_CPU_IMX35 },
-	{ .name = "imx50", .header_version = 2, .cpu_type = IMX_CPU_IMX50 },
-	{ .name = "imx51", .header_version = 1, .cpu_type = IMX_CPU_IMX51 },
-	{ .name = "imx53", .header_version = 2, .cpu_type = IMX_CPU_IMX53 },
-	{ .name = "imx6", .header_version = 2, .cpu_type = IMX_CPU_IMX6 },
-	{ .name = "imx7", .header_version = 2, .cpu_type = IMX_CPU_IMX7 },
-	{ .name = "vf610", .header_version = 2, .cpu_type = IMX_CPU_VF610 },
+	{ .name = "imx25",  .header_version = 1, .cpu_type = IMX_CPU_IMX25,  .header_gap = 0,      .first_opcode = 0xea0003fe /* b 0x1000 */},
+	{ .name = "imx35",  .header_version = 1, .cpu_type = IMX_CPU_IMX35,  .header_gap = 0,      .first_opcode = 0xea0003fe /* b 0x1000 */},
+	{ .name = "imx50",  .header_version = 2, .cpu_type = IMX_CPU_IMX50,  .header_gap = 0,      .first_opcode = 0xea0003fe /* b 0x1000 */},
+	{ .name = "imx51",  .header_version = 1, .cpu_type = IMX_CPU_IMX51,  .header_gap = 0,      .first_opcode = 0xea0003fe /* b 0x1000 */},
+	{ .name = "imx53",  .header_version = 2, .cpu_type = IMX_CPU_IMX53,  .header_gap = 0,      .first_opcode = 0xea0003fe /* b 0x1000 */},
+	{ .name = "imx6",   .header_version = 2, .cpu_type = IMX_CPU_IMX6,   .header_gap = 0,      .first_opcode = 0xea0003fe /* b 0x1000 */},
+	{ .name = "imx7",   .header_version = 2, .cpu_type = IMX_CPU_IMX7,   .header_gap = 0,      .first_opcode = 0xea0003fe /* b 0x1000 */},
+	{ .name = "imx8mq", .header_version = 2, .cpu_type = IMX_CPU_IMX8MQ, .header_gap = SZ_32K, .first_opcode = 0x14009000 /* b 0x9000 */},
+	{ .name = "vf610",  .header_version = 2, .cpu_type = IMX_CPU_VF610,  .header_gap = 0,      .first_opcode = 0xea0003fe /* b 0x1000 */},
 };
 
 static int do_soc(struct config_data *data, int argc, char *argv[])
@@ -249,6 +254,8 @@ static int do_soc(struct config_data *data, int argc, char *argv[])
 		if (!strcmp(socs[i].name, soc)) {
 			data->header_version = socs[i].header_version;
 			data->cpu_type = socs[i].cpu_type;
+			data->header_gap = socs[i].header_gap;
+			data->first_opcode = socs[i].first_opcode;
 
 			if (data->cpu_type == IMX_CPU_IMX35)
 				data->load_size += HEADER_LEN;
diff --git a/scripts/imx/imx.h b/scripts/imx/imx.h
index c7677f81a..92a3fd316 100644
--- a/scripts/imx/imx.h
+++ b/scripts/imx/imx.h
@@ -72,6 +72,8 @@ struct config_data {
 	char *outfile;
 	char *srkfile;
 	int header_version;
+	off_t header_gap;
+	uint32_t first_opcode;
 	int cpu_type;
 	int (*check)(const struct config_data *data, uint32_t cmd,
 		     uint32_t addr, uint32_t mask);
-- 
2.17.0


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

  parent reply	other threads:[~2018-06-12  1:56 UTC|newest]

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