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 <andrey.z@gmail.com>

3 files changed, 13 insertions, 6 deletions

diff --git a/conf/machine/imx8mp-evk.conf b/conf/machine/imx8mp-evk.conf
index f790ffb4..cee36a5a 100644
--- a/conf/machine/imx8mp-evk.conf
+++ b/conf/machine/imx8mp-evk.conf
@@ -9,8 +9,11 @@ MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mp:"
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa53.inc
 
-MACHINE_FEATURES += "pci wifi bluetooth optee jailhouse"
-MACHINE_FEATURES_append_use-nxp-bsp = " mrvl8997"
+MACHINE_FEATURES += "pci wifi bluetooth jailhouse"
+
+# 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 mrvl8997"
 
 # Mainline kernel contains only one DTB file for
 # imx8mpevk machine
diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index 6f21ce8e..619ad663 100644
--- a/conf/machine/include/imx8mm-evk.inc
+++ b/conf/machine/include/imx8mm-evk.inc
@@ -3,13 +3,15 @@ MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mm:"
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa53.inc
 
-MACHINE_FEATURES += "pci wifi bluetooth optee bcm43455 bcm4356"
+MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356"
 
 # NXP BSP can consume BCM4359 and QCA9377 driver and firmware
 # Since the firmware is not available publicly, and rather distributed
 # under "Proprietary" license - we opt-out from using it in all BSPs
 # and pin it to NXP BSP only
-MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359 qca9377"
+# 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 bcm4359 qca9377"
 
 KERNEL_DEVICETREE = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
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 \