From 44b50b896bc66a9ec3cac46131234c98fdee342b Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Sat, 21 Aug 2021 19:33:48 -0500 Subject: optee-os: Add support for imx6qdlsabre* machines Signed-off-by: Tom Hochstein --- recipes-security/optee-imx/optee-os_3.10.0.imx.bb | 2 ++ 1 file changed, 2 insertions(+) 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 dc0f17310..8bfaf8dd1 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" -- cgit v1.2.3-54-g00ecf From 0407a9ecbaedd8aae6be96225632dbe534840e44 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Sat, 21 Aug 2021 19:37:45 -0500 Subject: imx-base.inc: Fix optee boot images For optee support tee.bin is needed in the image. The optee image uTee is renamed with an SOC qualifier. Signed-off-by: Tom Hochstein --- conf/machine/include/imx-base.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 094b17db4..e86057497 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}" -- cgit v1.2.3-54-g00ecf From 4ebabc1936fd0d375541adc47be01878d00b5904 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Sat, 21 Aug 2021 19:48:39 -0500 Subject: imx6qdlsabre*: Add uboot config options for u-boot-imx Signed-off-by: Tom Hochstein --- conf/machine/imx6qdlsabreauto.conf | 21 +++++++++++++++------ conf/machine/imx6qdlsabresd.conf | 18 ++++++++++++------ 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index 8069fb3f7..af8a98851 100644 --- a/conf/machine/imx6qdlsabreauto.conf +++ b/conf/machine/imx6qdlsabreauto.conf @@ -33,20 +33,29 @@ 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 \ +" 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', \ diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf index 215e01834..1011b8774 100644 --- a/conf/machine/imx6qdlsabresd.conf +++ b/conf/machine/imx6qdlsabresd.conf @@ -42,20 +42,26 @@ 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 \ +" 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', \ -- cgit v1.2.3-54-g00ecf 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(+) diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index af8a98851..171b9f00d 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 1011b8774..a51336259 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