diff options
| author | Haoran.Wang <elven.wang@nxp.com> | 2017-09-04 19:25:32 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2017-11-03 02:37:26 +0800 |
| commit | 9d4858463e8fc83cedab0708852e02780b82f2a7 (patch) | |
| tree | f0a6f98793e25327708ab7917be2f2db02c273d2 /arch/arm/lib/bootm.c | |
| parent | 8052afe7ad5cd31f314bb706416afa38bc40eb6f (diff) | |
[iot] Fix non-secure uboot crash before jump to Linux
As ARMV7_NONSEC macro enabled so it will init uboot monitor
before jump to Linux and this will bring crash.
So goto Linux directly before this process.
Change-Id: Ieb44f326a4be21c20b662443c713009adb3c376e
Signed-off-by: Haoran.Wang <elven.wang@nxp.com>
Diffstat (limited to 'arch/arm/lib/bootm.c')
| -rw-r--r-- | arch/arm/lib/bootm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 8125cf023f5..7236abe22e2 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -369,6 +369,9 @@ static void boot_jump_linux(bootm_headers_t *images, int flag) if (!fake) { #ifdef CONFIG_ARMV7_NONSEC +#ifdef CONFIG_IMX_TRUSTY_OS + kernel_entry(0, machid, r2); +#endif if (armv7_boot_nonsec()) { armv7_init_nonsec(); secure_ram_addr(_do_nonsec_entry)(kernel_entry, |