[iot] Fix non-secure uboot crash before jump to Linux
authorHaoran.Wang <elven.wang@nxp.com>
Mon, 4 Sep 2017 11:25:32 +0000 (19:25 +0800)
committerJason Liu <jason.hui.liu@nxp.com>
Thu, 2 Nov 2017 18:37:26 +0000 (02:37 +0800)
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>
arch/arm/lib/bootm.c

index 8125cf0..7236abe 100644 (file)
@@ -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,