From f21c53af3f4efe7bbddab49ada381b449cd94b70 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Sun, 7 Feb 2021 12:00:24 +0000 Subject: conf: machine: imx8m: make optee feature nxp dependent Mainline BSP does have lockups in boot when OP-TEE is included in the build. Make optee feature enabled only when NXP BSP flavor is chosen. Signed-off-by: Andrey Zhizhikin --- conf/machine/include/imx8mn-evk.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'conf/machine/include/imx8mn-evk.inc') diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc index 265b594c..ad4f5dea 100644 --- a/conf/machine/include/imx8mn-evk.inc +++ b/conf/machine/include/imx8mn-evk.inc @@ -3,10 +3,12 @@ MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mn:" require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa53.inc -MACHINE_FEATURES += "wifi bluetooth optee bcm43455 bcm4356" +MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356" # NXP BSP can consume proprietary jailhouse and Broadcom drivers -MACHINE_FEATURES_append_use-nxp-bsp = " jailhouse bcm4359" +# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have +# a full support for it yet. +MACHINE_FEATURES_append_use-nxp-bsp = " optee jailhouse bcm4359" KERNEL_DEVICETREE = " \ freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ -- cgit v1.2.3-54-g00ecf