Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit cb72301d6598af97da392bfd590b369c0a5837d5

Authored by Peng Fan
1 parent fc3de80211
Exists in smarc_8mq-imx_v2020.04_5.4.24_2.1.0 and in 1 other branch smarc_8mm-imx_v2020.04_5.4.24_2.1.0

MLK-24189-2 arm: imx: optee: ignore node create for xen 

Ignore node create for xen, currently we not have valid
registers when booting in xen, it might have garbage value and cause
kernel hang.

Reviewed-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 0c6cc66b1181c72b8f9165875b9db075a1de89de)

Showing 1 changed file with 3 additions and 0 deletions Side-by-side Diff

arch/arm/mach-imx/dt_optee.c
Diff comments   View file @ cb72301
... ... @@ -17,6 +17,9 @@
17 17 phys_addr_t optee_start;
18 18 size_t optee_size;
19 19  
  20 + /* Not let uboot create the node */
  21 + if (CONFIG_IS_ENABLED(XEN))
  22 + return 0;
20 23 /*
21 24 * No TEE space allocated indicating no TEE running, so no
22 25 * need to add optee node in dts