diff options
| author | Peng Fan <peng.fan@nxp.com> | 2020-05-28 15:41:57 +0800 |
|---|---|---|
| committer | Peng Fan <peng.fan@nxp.com> | 2020-05-28 17:20:50 +0800 |
| commit | cb72301d6598af97da392bfd590b369c0a5837d5 (patch) | |
| tree | af260be48397ce0b9471e7cf5de53f9ccee8ee19 /arch/arm | |
| parent | fc3de8021108bce200701c1afb0857b6fef3b0d7 (diff) | |
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)
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-imx/dt_optee.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/dt_optee.c b/arch/arm/mach-imx/dt_optee.c index 145105063f..3441a0a9ee 100644 --- a/arch/arm/mach-imx/dt_optee.c +++ b/arch/arm/mach-imx/dt_optee.c @@ -17,6 +17,9 @@ int ft_add_optee_node(void *fdt, bd_t *bd) phys_addr_t optee_start; size_t optee_size; + /* Not let uboot create the node */ + if (CONFIG_IS_ENABLED(XEN)) + return 0; /* * No TEE space allocated indicating no TEE running, so no * need to add optee node in dts |