From 095fe073c35cadd9b287847268a1ce6ad6478c3f Mon Sep 17 00:00:00 2001
From: Ben Taylor <ben.taylor@linaro.org>
Date: Mon, 12 Jan 2026 08:10:45 +0000
Subject: [PATCH] Update tf-psa-crypto and framework modules to resolve merge
 conflict and config_macros import error

Signed-off-by: Ben Taylor <ben.taylor@linaro.org>
---
 framework     | 2 +-
 tf-psa-crypto | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework b/framework
index 77f707a557..ee399cc257 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 77f707a5576c5bdd1ff9463c7b25d2488497f57e
+Subproject commit ee399cc257e84c2c5328d866335053d05b3b169c
diff --git a/tf-psa-crypto b/tf-psa-crypto
index 2025c77606..f7ad6b6931 160000
--- a/tf-psa-crypto
+++ b/tf-psa-crypto
@@ -1 +1 @@
-Subproject commit 2025c776064a418406cb83d66fff06624d0e3734
+Subproject commit f7ad6b6931e179c2e40b3d04f3e6d207a7e3c36e