diff options
| author | Haoran.Wang <elven.wang@nxp.com> | 2017-10-10 23:05:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-10 23:05:41 +0000 |
| commit | d716a06256a938aadea380e1717c49fdf8c9a561 (patch) | |
| tree | 832b03c6877880fd3827fab6b33853b6e7e10530 | |
| parent | 74297bcee79f214c6b8bf061aa9229f2f568d6e7 (diff) | |
| parent | 2f94e8276e9af52f8af00ccef5f155bc855129b4 (diff) | |
| download | uboot-imx-d716a06256a938aadea380e1717c49fdf8c9a561.tar.gz | |
[iot] Fix non-secure uboot crash before jump to Linux am: c514cf8fb6
am: 2f94e8276e
Change-Id: I70e51744b7b6b8101c2a80be185933c9f912a863
| -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 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, |