gistfile1.txt

From ada3983198756ed9d3e05618d0879ef350571204 Mon Sep 17 00:00:00 2001
From: Nishanth Menon <nm@ti.com>
Date: Fri, 22 Oct 2021 21:17:38 -0500
Subject: [PATCH] optee-os: Add support for alternate console

Actual systems may choose to use a different console from the default
Allow the machine configurations to describe the same.

Since the option provided is custom to TI K3, make this a k3 product
override capability.

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 recipes-security/optee/optee-os_%.bbappend | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend
index c90d85eace61..cd8e1b7a5997 100644
--- a/recipes-security/optee/optee-os_%.bbappend
+++ b/recipes-security/optee/optee-os_%.bbappend
@@ -10,6 +10,8 @@ SRC_URI_ti-soc = " \
     file://0007-allow-setting-sysroot-for-clang.patch \
 "
 
+EXTRA_OEMAKE_append_k3 = "${@ 'CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}"
+
 do_compile_prepend_ti-soc() {
     export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
 }
-- 
2.31.1

gistfile2.txt

From f5abc489a4bce2b197808e9184736f79ec4025fd Mon Sep 17 00:00:00 2001
From: Nishanth Menon <nm@ti.com>
Date: Fri, 22 Oct 2021 21:19:02 -0500
Subject: [PATCH] trusted-firmware-a: Add support for alternate console

Actual systems may choose to use a different console from the default
Allow the machine configurations to describe the same. Since the
option provided is custom to TI K3, make this a k3 product override
capability.

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
index eb6f2fd11031..d4dfb8676f58 100644
--- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -8,6 +8,8 @@ TFA_BUILD_TARGET_k3 = "all"
 TFA_INSTALL_TARGET_k3 = "bl31"
 TFA_SPD_k3 = "opteed"
 
+EXTRA_OEMAKE_append_k3 = "${@ 'K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}"
+
 do_compile_append_am65xx-hs-evm() {
 	export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
 	( cd ${B}/${BUILD_DIR}/release/; \
-- 
2.31.1