4 files changed, 37 insertions, 14 deletions

diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index 8069fb3f..171b9f00 100644
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -33,25 +33,37 @@ KERNEL_DEVICETREE:use-mainline-bsp = " \
 "
 
 ### u-boot-fslc settings ###
-
 SPL_BINARY:pn-u-boot-fslc = "SPL"
-UBOOT_MACHINE:pn-u-boot-fslc ?= "mx6sabreauto_defconfig"
+UBOOT_CONFIG:pn-u-boot-fslc ??= "sd-fslc"
 UBOOT_SUFFIX:pn-u-boot-fslc = "img"
 
 ### u-boot-imx settings ###
-
-# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
-# variants. Change the defconfig to the targeted SoC variant.
 SPL_BINARY:pn-u-boot-imx = ""
-UBOOT_MACHINE:pn-u-boot-imx = "mx6qsabreauto_defconfig"
+UBOOT_CONFIG:pn-u-boot-imx ??= " \
+    sd-imx \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee-imx', '', d)} \
+"
 UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx"
 UBOOT_SUFFIX:pn-u-boot-imx = "imx"
 
+# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
+# variants. Change the defconfig to the targeted SoC variant.
+UBOOT_CONFIG[sd-fslc]      = "mx6sabreauto_defconfig,sdcard"
+UBOOT_CONFIG[sd-imx]       = "mx6qpsabreauto_defconfig,sdcard"
+UBOOT_CONFIG[sd-optee-imx] = "mx6qpsabreauto_optee_defconfig,sdcard"
+UBOOT_CONFIG[eimnor-imx]   = "mx6qpsabreauto_eimnor_defconfig"
+UBOOT_CONFIG[nand-imx]     = "mx6qpsabreauto_nand_defconfig,ubifs"
+UBOOT_CONFIG[spinor-imx]   = "mx6qpsabreauto_spinor_defconfig"
+UBOOT_CONFIG[sata-imx]     = "mx6qpsabreauto_sata_defconfig"
+UBOOT_CONFIG[mfgtool-imx]  = "mx6qpsabreauto_defconfig"
+
 WKS_FILE = " \
     ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \
                          'u-boot-fslc', 'imx-uboot-spl-bootpart.wks.in', \
                                         'imx-uboot-bootpart.wks.in', d)}"
 
+OPTEE_BIN_EXT = "6qpauto"
+
 SERIAL_CONSOLES = "115200;ttymxc3"
 
 MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k"
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index 215e0183..a5133625 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -42,25 +42,34 @@ KERNEL_DEVICETREE:use-mainline-bsp = " \
 "
 
 ### u-boot-fslc settings ###
-
 SPL_BINARY:pn-u-boot-fslc = "SPL"
-UBOOT_MACHINE:pn-u-boot-fslc ?= "mx6sabresd_defconfig"
+UBOOT_CONFIG:pn-u-boot-fslc ??= "sd-fslc"
 UBOOT_SUFFIX:pn-u-boot-fslc = "img"
 
 ### u-boot-imx settings ###
-
-# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
-# variants. Change the defconfig to the targeted SoC variant.
 SPL_BINARY:pn-u-boot-imx = ""
-UBOOT_MACHINE:pn-u-boot-imx ?= "mx6qsabresd_defconfig"
+UBOOT_CONFIG:pn-u-boot-imx ??= " \
+    sd-imx \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee-imx', '', d)} \
+"
 UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx"
 UBOOT_SUFFIX:pn-u-boot-imx = "imx"
 
+# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
+# variants. Change the defconfig to the targeted SoC variant.
+UBOOT_CONFIG[sd-fslc]      = "mx6sabresd_defconfig,sdcard"
+UBOOT_CONFIG[sd-imx]       = "mx6qsabresd_defconfig,sdcard"
+UBOOT_CONFIG[sd-optee-imx] = "mx6qsabresd_optee_defconfig,sdcard"
+UBOOT_CONFIG[sata-imx]     = "mx6qsabresd_sata_defconfig"
+UBOOT_CONFIG[mfgtool-imx]  = "mx6qsabresd_defconfig"
+
 WKS_FILE = " \
     ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \
                          'u-boot-fslc', 'imx-uboot-spl-bootpart.wks.in', \
                                         'imx-uboot-bootpart.wks.in', d)}"
 
+OPTEE_BIN_EXT = "6qsdb"
+
 SERIAL_CONSOLES = "115200;ttymxc0"
 
 MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 094b17db..e8605749 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -406,8 +406,8 @@ SOC_DEFAULT_IMAGE_FSTYPES:mxs = "uboot-mxsboot-sdcard wic.bmap wic.gz"
 # Do not update fstab file when using wic images
 WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update"
 
-OPTEE_BOOT_IMAGE         = "uTee"
-OPTEE_BOOT_IMAGE:aarch64 = ""
+OPTEE_BOOT_IMAGE         = "tee.bin uTee-${OPTEE_BIN_EXT}"
+OPTEE_BOOT_IMAGE:aarch64 = "tee.bin"
 
 IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}"
 
diff --git a/recipes-security/optee-imx/optee-os_3.10.0.imx.bb b/recipes-security/optee-imx/optee-os_3.10.0.imx.bb
index dc0f1731..8bfaf8dd 100644
--- a/recipes-security/optee-imx/optee-os_3.10.0.imx.bb
+++ b/recipes-security/optee-imx/optee-os_3.10.0.imx.bb
@@ -22,6 +22,8 @@ inherit deploy python3native autotools
 
 # The platform flavor corresponds to the Yocto machine without the leading 'i'.
 PLATFORM_FLAVOR                   = "${@d.getVar('MACHINE')[1:]}"
+PLATFORM_FLAVOR:imx6qdlsabresd    = "mx6qsabresd"
+PLATFORM_FLAVOR:imx6qdlsabreauto  = "mx6qsabreauto"
 PLATFORM_FLAVOR:imx6qpdlsolox     = "mx6qsabresd"
 PLATFORM_FLAVOR:imx6ul7d          = "mx6ulevk"
 PLATFORM_FLAVOR:imx6ull14x14evk   = "mx6ullevk"