diff options
| author | Ji Luo <ji.luo@nxp.com> | 2021-05-19 18:51:06 +0800 |
|---|---|---|
| committer | Ji Luo <ji.luo@nxp.com> | 2022-04-20 09:33:10 +0800 |
| commit | adbfbbab93741489e8bf8ba08de3ab11be717351 (patch) | |
| tree | c021be541bddbf95bcec6b1194ccb63c43185245 /arch/arm | |
| parent | c7d5f44ec3a38df75412bf09d937eb90a9723e15 (diff) | |
MA-19067 android: skip optee dtb node handling
Android doesn't use optee so skip optee dtb node
handling.
Change-Id: I30bf91a62fe774dbae0d219fd17405feed6f0784
Signed-off-by: Ji Luo <ji.luo@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 4fd9870d55faadec1f19e29b6b620225bb821418)
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-imx/imx8m/soc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index f236ee157d..fb6114553f 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -1456,7 +1456,11 @@ usb_modify_speed: delete_u_boot_nodes(blob); +#if defined(CONFIG_ANDROID_SUPPORT) || defined(CONFIG_ANDROID_AUTO_SUPPORT) + return 0; +#else return ft_add_optee_node(blob, bd); +#endif } #endif |