From 4c5461c23708d9f235976f25acd95cd30114af7e Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 13 Jun 2023 21:18:42 +0000 Subject: optee: local fix for stray CFG_MAP_EXT_DT_SECURE=y in meta-arm Latest update in meta-arm added unconditional CFG_MAP_EXT_DT_SECURE=y that affects all platforms, but was only needed for qemu. And it also depends on CFG_DT=y, which is platform-specific. The fix was submitted upstream[0], overlay it locally until upstream resolves it. [0] https://patchwork.yoctoproject.org/project/arm/patch/20230613181723.1711212-1-denis@denix.org/ Signed-off-by: Denys Dmytriyenko Signed-off-by: Ryan Eatmon --- meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc | 1 + meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend | 4 ++++ meta-ti-bsp/recipes-security/optee/optee-os-ti.inc | 2 ++ 3 files changed, 7 insertions(+) create mode 100644 meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc create mode 100644 meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc new file mode 100644 index 00000000..df46e243 --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc @@ -0,0 +1 @@ +EXTRA_OEMAKE:remove = "CFG_MAP_EXT_DT_SECURE=y" diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend new file mode 100644 index 00000000..08c5256b --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend @@ -0,0 +1,4 @@ +OPTEE_TI = "" +OPTEE_TI:ti-soc = "${BPN}-ti.inc" + +require ${OPTEE_TI} diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc index 20f88127..1f898a6d 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc @@ -1,6 +1,8 @@ # Use TI SECDEV for signing inherit ti-secdev +EXTRA_OEMAKE:remove = "CFG_MAP_EXT_DT_SECURE=y" + EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" EXTRA_OEMAKE:append:am62xx = " CFG_WITH_SOFTWARE_PRNG=y CFG_TEE_CORE_LOG_LEVEL=1" -- cgit v1.2.3-54-g00ecf