From 4bf81ebb5109eceeb0d67b946831882e3d22798c Mon Sep 17 00:00:00 2001 From: Aswin Murugan Date: Fri, 11 Sep 2026 12:50:19 +0530 Subject: [PATCH 1/2] configs: nord: enable OP-TEE support in U-Boot and SPL Enable CONFIG_TEE, CONFIG_OPTEE and CONFIG_OPTEE_LIB in Nord U-Boot and SPL defconfigs to support OP-TEE integration. Signed-off-by: Aswin Murugan --- configs/qcom_nord_defconfig | 4 ++++ configs/qcom_nord_ride_spl_defconfig | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/configs/qcom_nord_defconfig b/configs/qcom_nord_defconfig index b5e95db921b4..7eae5ab00c15 100644 --- a/configs/qcom_nord_defconfig +++ b/configs/qcom_nord_defconfig @@ -21,3 +21,7 @@ CONFIG_REMAKE_ELF=y # Address where U-Boot will be loaded CONFIG_TEXT_BASE=0xD8D00000 + +CONFIG_TEE=y +CONFIG_OPTEE=y +CONFIG_OPTEE_LIB=y diff --git a/configs/qcom_nord_ride_spl_defconfig b/configs/qcom_nord_ride_spl_defconfig index ca2bab9d85bb..175a44f397b6 100644 --- a/configs/qcom_nord_ride_spl_defconfig +++ b/configs/qcom_nord_ride_spl_defconfig @@ -21,6 +21,10 @@ CONFIG_ENV_SCSI_PART_TYPE_GUID="bc0330eb-3410-4951-a617-03898dbe3372" # CONFIG_ENV_IS_DEFAULT is not set # CONFIG_ENV_IS_NOWHERE is not set +CONFIG_TEE=y +CONFIG_OPTEE=y +CONFIG_OPTEE_LIB=y + # SPL configurations for Nord-Ride # Purpose: Load FIT image (containing TFA, OPTEE and U-Boot proper) # from UFS storage and jump to next image (TFA) From ef0ca63f538712b70705cfcd3c31f4a2748d5f2f Mon Sep 17 00:00:00 2001 From: Aswin Murugan Date: Fri, 11 Sep 2026 14:37:51 +0530 Subject: [PATCH 2/2] mach-snapdragon: fix OP-TEE SPL link failure Use CONFIG_IS_ENABLED(OPTEE) instead of IS_ENABLED(CONFIG_OPTEE) to avoid calling OP-TEE APIs in SPL builds where the driver is not available, fixing the SPL link error. Fixes: undefined reference to `is_optee_smc_api' in spl/u-boot-spl Signed-off-by: Aswin Murugan --- arch/arm/mach-snapdragon/of_fixup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-snapdragon/of_fixup.c b/arch/arm/mach-snapdragon/of_fixup.c index 4420b8fa8af6..6259929a78c5 100644 --- a/arch/arm/mach-snapdragon/of_fixup.c +++ b/arch/arm/mach-snapdragon/of_fixup.c @@ -273,7 +273,7 @@ static int qcom_of_fixup_nodes(void * __maybe_unused ctx, struct event *event) time_call(fixup_usb_nodes, root); - if (IS_ENABLED(CONFIG_OPTEE) && is_optee_smc_api()) + if (CONFIG_IS_ENABLED(OPTEE) && is_optee_smc_api()) time_call(add_optee_node, root); return 0;