diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-11-09 10:55:02 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-11-09 10:55:02 +0100 |
| commit | 98c31d3e3659566011dbce1c1d649d7c4ec021e1 (patch) | |
| tree | 6f7e33c2ef3cfdafd25130c7245b9007c57e7986 /scripts | |
| parent | 5576a028d0b722a1c3b125d3ac0322debc7e724b (diff) | |
| parent | 5200ea0ff626ccf6602331ce9d0fe4ef6ab128ca (diff) | |
| download | barebox-98c31d3e3659566011dbce1c1d649d7c4ec021e1.tar.gz barebox-98c31d3e3659566011dbce1c1d649d7c4ec021e1.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/imx/imx-image.c | 6 | ||||
| -rw-r--r-- | scripts/imx/imx.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c index 88e2cb955f..fa93e47917 100644 --- a/scripts/imx/imx-image.c +++ b/scripts/imx/imx-image.c @@ -894,6 +894,12 @@ int main(int argc, char *argv[]) if (cpu_is_aarch64(&data)) { bb_header = bb_header_aarch64; sizeof_bb_header = sizeof(bb_header_aarch64); + /* + * Compute jump offset, must be done dynamically as the code + * location changes depending on the presence of a signed HDMI + * firmware. + */ + data.first_opcode |= (data.header_gap + header_len) >> 2; } else { bb_header = bb_header_aarch32; sizeof_bb_header = sizeof(bb_header_aarch32); diff --git a/scripts/imx/imx.c b/scripts/imx/imx.c index 2341732b2f..43f67da288 100644 --- a/scripts/imx/imx.c +++ b/scripts/imx/imx.c @@ -243,7 +243,7 @@ static struct soc_type socs[] = { { .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 = "imx8mq", .header_version = 2, .cpu_type = IMX_CPU_IMX8MQ, .header_gap = SZ_32K, .first_opcode = 0x14000000 /* b 0x0000 (offset computed) */}, { .name = "vf610", .header_version = 2, .cpu_type = IMX_CPU_VF610, .header_gap = 0, .first_opcode = 0xea0003fe /* b 0x1000 */}, }; |