summaryrefslogtreecommitdiffstats
path: root/scripts/imx/imx-image.c
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/imx/imx-image.c')
-rw-r--r--scripts/imx/imx-image.c99
1 files changed, 69 insertions, 30 deletions
diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
index 294f51a902..6ebae22562 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;
@@ -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,
@@ -207,18 +230,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 +269,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 +299,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 +332,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 +340,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)
@@ -666,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;
@@ -679,12 +693,17 @@ int main(int argc, char *argv[])
int dcd_only = 0;
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,
.check = check,
.nop = nop,
};
+ uint32_t *bb_header;
+ size_t sizeof_bb_header;
prgname = argv[0];
@@ -791,7 +810,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);
@@ -806,7 +825,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",
@@ -814,6 +833,17 @@ 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);
if (!infile)
exit(1);
@@ -824,14 +854,23 @@ int main(int argc, char *argv[])
exit(1);
}
- ret = xwrite(outfd, buf, HEADER_LEN);
- if (ret < 0) {
- perror("write");
- exit(1);
- }
+ header_copies = (data.cpu_type == IMX_CPU_IMX35) ? 2 : 1;
+
+ for (i = 0; i < header_copies; i++) {
+ ret = xwrite(outfd, add_barebox_header ? bb_header : buf,
+ sizeof_bb_header);
+ if (ret < 0) {
+ perror("write");
+ exit(1);
+ }
+
+ if (lseek(outfd, data.header_gap, SEEK_CUR) < 0) {
+ perror("lseek");
+ exit(1);
+ }
- if (data.cpu_type == IMX_CPU_IMX35) {
- ret = xwrite(outfd, buf, HEADER_LEN);
+ ret = xwrite(outfd, buf + sizeof_bb_header,
+ HEADER_LEN - sizeof_bb_header);
if (ret < 0) {
perror("write");
exit(1);
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 07:42:11 +0000