From 4d0adc756e0243828423b60ccdb4d499889d468c Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 3 Dec 2020 15:52:08 -0600 Subject: [PATCH] imx6sxsabreauto: Add OP-TEE Add OP-TEE support. Add optee to MACHINE_FEATURES to enable OP-TEE in u-boot-imx. OP-TEE is currently not supported by u-boot-fslc. Signed-off-by: Tom Hochstein --- conf/machine/imx6sxsabreauto.conf | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf index 43cabea2..e8fede4a 100644 --- a/conf/machine/imx6sxsabreauto.conf +++ b/conf/machine/imx6sxsabreauto.conf @@ -15,11 +15,17 @@ KERNEL_DEVICETREE_use-mainline-bsp = "imx6sx-sabreauto.dtb" PREFERRED_PROVIDER_u-boot = "u-boot-fslc" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-fslc" -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "mx6sxsabreauto_config,sdcard" -UBOOT_CONFIG[qspi1] = "mx6sxsabreauto_qspi1_config" -UBOOT_CONFIG[nand] = "mx6sxsabreauto_nand_config,ubifs" -UBOOT_CONFIG[mfgtool] = "mx6sxsabreauto_config" +UBOOT_CONFIG ??= " \ + sd \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ +" +UBOOT_CONFIG[sd] = "mx6sxsabreauto_config,sdcard" +UBOOT_CONFIG[sd-optee] = "mx6sxsabreauto_optee_config,sdcard" +UBOOT_CONFIG[qspi1] = "mx6sxsabreauto_qspi1_config" +UBOOT_CONFIG[nand] = "mx6sxsabreauto_nand_config,ubifs" +UBOOT_CONFIG[mfgtool] = "mx6sxsabreauto_config" + +OPTEE_BIN_EXT = "6sxauto" SERIAL_CONSOLES = "115200;ttymxc3" -- 2.40.1