From 52d3cd841b91d0285e34813ea4a8fe079432adfe Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Sat, 21 Aug 2021 19:52:06 -0500 Subject: imx6qdlsabre*: Add support for optee If optee is enabled via machine feature, use optee uboot config. Signed-off-by: Tom Hochstein --- conf/machine/imx6qdlsabreauto.conf | 3 +++ conf/machine/imx6qdlsabresd.conf | 3 +++ 2 files changed, 6 insertions(+) (limited to 'conf/machine') diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index af8a9885..171b9f00 100644 --- 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 1011b877..a5133625 100644 --- 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" -- cgit v1.2.3-54-g00ecf