From 9d4858463e8fc83cedab0708852e02780b82f2a7 Mon Sep 17 00:00:00 2001 From: "Haoran.Wang" Date: Mon, 4 Sep 2017 19:25:32 +0800 Subject: [PATCH] [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 --- arch/arm/lib/bootm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 8125cf023f..7236abe22e 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, -- 2.17.1