diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-08-22 10:27:14 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-08-23 10:10:09 +0200 |
commit | e42f738cd89b9ec997966cedc5aa58368f3ffadd (patch) | |
tree | cf3fc22ca679477b0d982cd0b4b688dc90b63b66 /arch/arm/boards/nxp-imx8mq-evk/lowlevel.c | |
parent | ebbb2a43af7a32b19a041c77d33a3cd13266d2d5 (diff) | |
download | barebox-e42f738cd89b9ec997966cedc5aa58368f3ffadd.tar.gz barebox-e42f738cd89b9ec997966cedc5aa58368f3ffadd.tar.xz |
ARM: nxp-imx8mq-evk: Replace trampoline
When the TF-A finishes it jumps to a hardcoded address in DRAM. We used
to put a trampoline there which brings us back to our image in SRAM.
Instead of putting a trampoline into DRAM just copy the image there
which simplifies things a bit.
Note that currently imx8_esdhc_load_piggy() uses that very same address
as a temporary buffer. This is changed in the next patch. Currently the
board is broken anyway, so we don't break bisectability.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/nxp-imx8mq-evk/lowlevel.c')
-rw-r--r-- | arch/arm/boards/nxp-imx8mq-evk/lowlevel.c | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/arch/arm/boards/nxp-imx8mq-evk/lowlevel.c b/arch/arm/boards/nxp-imx8mq-evk/lowlevel.c index cb1c499cb0..46dba16ec3 100644 --- a/arch/arm/boards/nxp-imx8mq-evk/lowlevel.c +++ b/arch/arm/boards/nxp-imx8mq-evk/lowlevel.c @@ -56,27 +56,6 @@ static void nxp_imx8mq_evk_sram_setup(void) ddr_init(); } -extern unsigned char trampoline_start[]; -extern unsigned char trampoline_end[]; - -static void nxp_imx8mq_evk_install_tfa_trampoline(void) -{ - unsigned int tramp_len; - unsigned int offset; - /* - * Create a trampoline which is places in DRAM and calls back into the - * PBL entry function found in the TCRAM. Register x0 is set to 1 to - * indicate that DRAM setup was already run. - */ - tramp_len = (void *)trampoline_end - (void *)trampoline_start; - memcpy((void *)MX8MQ_ATF_BL33_BASE_ADDR, (void *)trampoline_start, - tramp_len); - - offset = get_runtime_offset(); - memcpy((void *)MX8MQ_ATF_BL33_BASE_ADDR + tramp_len, &offset, - sizeof(offset)); -} - /* * Power-on execution flow of start_nxp_imx8mq_evk() might not be * obvious for a very first read, so here's, hopefully helpful, @@ -117,8 +96,12 @@ static __noreturn noinline void nxp_imx8mq_evk_start(void) */ if (current_el() == 3) { nxp_imx8mq_evk_sram_setup(); - nxp_imx8mq_evk_install_tfa_trampoline(); get_builtin_firmware(imx8mq_bl31_bin, &bl31, &bl31_size); + /* + * On completion the TF-A will jump to MX8MQ_ATF_BL33_BASE_ADDR in + * EL2. Copy ourselves there. + */ + memcpy((void *)MX8MQ_ATF_BL33_BASE_ADDR, _text, __bss_start - _text); imx8mq_atf_load_bl31(bl31, bl31_size); } |