imx6qdlsabre*: Add support for optee

If optee is enabled via machine feature, use optee uboot config.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>

diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index af8a98851c3622e4a263482a410ab320ffb1613a..171b9f00d1c8f154fdc3b83489a93a50732304ec 100644 (file)
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -41,6 +41,7 @@ UBOOT_SUFFIX:pn-u-boot-fslc = "img"
 SPL_BINARY:pn-u-boot-imx = ""
 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"
@@ -61,6 +62,8 @@ WKS_FILE = " \
                          '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 1011b8774be0ea69f2bdacdbde2af2e029cb48dd..a5133625999e83e4088f422d65f2035985de0dc7 100644 (file)
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -50,6 +50,7 @@ UBOOT_SUFFIX:pn-u-boot-fslc = "img"
 SPL_BINARY:pn-u-boot-imx = ""
 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"
@@ -67,6 +68,8 @@ WKS_FILE = " \
                          '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"