summaryrefslogtreecommitdiffstats
path: root/conf/machine/imx8mp-evk.conf
diff options
context:
space:
mode:
authorAndrey Zhizhikin <andrey.z@gmail.com>2021-02-07 12:00:24 +0000
committerOtavio Salvador <otavio@ossystems.com.br>2021-03-17 10:53:42 -0300
commitf21c53af3f4efe7bbddab49ada381b449cd94b70 (patch)
treef0c080ef2d3e3a73c290d9204a917b0be5e78a46 /conf/machine/imx8mp-evk.conf
parentaf1befc57af48bfd556a487487663cd3628433f5 (diff)
downloadmeta-freescale-f21c53af3f4efe7bbddab49ada381b449cd94b70.tar.gz
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>
Diffstat (limited to 'conf/machine/imx8mp-evk.conf')
-rw-r--r--conf/machine/imx8mp-evk.conf7
1 files changed, 5 insertions, 2 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:"
9require conf/machine/include/imx-base.inc 9require conf/machine/include/imx-base.inc
10require conf/machine/include/tune-cortexa53.inc 10require conf/machine/include/tune-cortexa53.inc
11 11
12MACHINE_FEATURES += "pci wifi bluetooth optee jailhouse" 12MACHINE_FEATURES += "pci wifi bluetooth jailhouse"
13MACHINE_FEATURES_append_use-nxp-bsp = " mrvl8997" 13
14# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
15# a full support for it yet.
16MACHINE_FEATURES_append_use-nxp-bsp = " optee mrvl8997"
14 17
15# Mainline kernel contains only one DTB file for 18# Mainline kernel contains only one DTB file for
16# imx8mpevk machine 19# imx8mpevk machine