From 78d3523e21e6c9682ff6bc8806ff79d5fd1c6e66 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Mon, 4 Aug 2025 15:08:52 +0200 Subject: [PATCH 1/2] Allow everest to be missing Signed-off-by: Gilles Peskine --- library/Makefile | 3 +++ scripts/common.make | 5 ++++- scripts/generate_visualc_files.pl | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/library/Makefile b/library/Makefile index f8729344b47f..842599fdb5dc 100644 --- a/library/Makefile +++ b/library/Makefile @@ -115,7 +115,10 @@ OBJS_CRYPTO := $(filter-out $(GENERATED_OBJS_CRYPTO),$(OBJS_CRYPTO)) OBJS_CRYPTO += $(GENERATED_OBJS_CRYPTO) THIRDPARTY_DIR := $(MBEDTLS_PATH)/tf-psa-crypto/drivers +ifeq "$(MBEDTLS_PATH)/tf-psa-crypto/drivers/everest/Makefile.inc" \ + "$(wildcard $(MBEDTLS_PATH)/tf-psa-crypto/drivers/everest/Makefile.inc)" include $(MBEDTLS_PATH)/tf-psa-crypto/drivers/everest/Makefile.inc +endif include $(MBEDTLS_PATH)/tf-psa-crypto/drivers/p256-m/Makefile.inc LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES) OBJS_CRYPTO+=$(THIRDPARTY_CRYPTO_OBJECTS) diff --git a/scripts/common.make b/scripts/common.make index b3d028ff6277..6756fea90684 100644 --- a/scripts/common.make +++ b/scripts/common.make @@ -46,7 +46,10 @@ LOCAL_LDFLAGS = ${MBEDTLS_TEST_OBJS} \ endif THIRDPARTY_DIR = $(MBEDTLS_PATH)/tf-psa-crypto/drivers -include $(THIRDPARTY_DIR)/everest/Makefile.inc +ifeq "$(MBEDTLS_PATH)/tf-psa-crypto/drivers/everest/Makefile.inc" \ + "$(wildcard $(MBEDTLS_PATH)/tf-psa-crypto/drivers/everest/Makefile.inc)" +include $(MBEDTLS_PATH)/tf-psa-crypto/drivers/everest/Makefile.inc +endif include $(THIRDPARTY_DIR)/p256-m/Makefile.inc LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES) diff --git a/scripts/generate_visualc_files.pl b/scripts/generate_visualc_files.pl index ef684b79d892..c6e62c34d095 100755 --- a/scripts/generate_visualc_files.pl +++ b/scripts/generate_visualc_files.pl @@ -123,6 +123,7 @@ sub check_dirs { foreach my $d (@thirdparty_header_dirs, @thirdparty_source_dirs) { + next if $d =~ m!/everest/!; # Allow the everest submodule to be missing if (not (-d $d)) { return 0; } } return -d $vsx_dir From 9ee9ef4469726b6c227e68f78665414f1a3558d2 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Mon, 4 Aug 2025 15:09:40 +0200 Subject: [PATCH 2/2] Update crypto with everest in a submodule Signed-off-by: Gilles Peskine --- tf-psa-crypto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tf-psa-crypto b/tf-psa-crypto index fc1dca61954e..1bf81cbbdccd 160000 --- a/tf-psa-crypto +++ b/tf-psa-crypto @@ -1 +1 @@ -Subproject commit fc1dca61954ee58701a47ba24cc27004e05440b2 +Subproject commit 1bf81cbbdccd05e47a250b03c24835dee25430da