commit 36f79f7aa129c20a6b78145088b06d8a91e95346
author Summer Qin <summer.qin@arm.com> Tue Jul 05 14:53:35 2022 +0800
committer Antonio de Angelis <Antonio.deAngelis@arm.com> Fri Jul 15 13:22:22 2022 +0200
tree 5d7bf09337c6adcdbaa87badc8da5dd7efe64d56
parent 249aba9da040b3e8982bea01c52eeabae9087003

CC312: XXX_ALT is not needed when use PSA driver

XXX_ALT is not needed when CC312 use PSA driver.
Use PSA driver for CC3XX driver to avoid fallback to software
implementation which will save 7.85KB in ROM size.

Signed-off-by: Summer Qin <summer.qin@arm.com>
Change-Id: I7f4b7497f8e6513718423d3b69d37b5f0fd9a1b0

bl2/CMakeLists.txt

diff --git a/bl2/CMakeLists.txt b/bl2/CMakeLists.txt
index a4dffb5..b803cd4 100644
--- a/bl2/CMakeLists.txt
+++ b/bl2/CMakeLists.txt
@@ -78,6 +78,7 @@
         MBEDTLS_CONFIG_FILE="${MCUBOOT_MBEDCRYPTO_CONFIG_FILEPATH}"
         # Workaround for https://github.com/ARMmbed/mbedtls/issues/1077
         $<$<OR:$<STREQUAL:${TFM_SYSTEM_ARCHITECTURE},armv8-m.base>,$<STREQUAL:${TFM_SYSTEM_ARCHITECTURE},armv6-m>>:MULADDC_CANNOT_USE_R7>
+        $<$<BOOL:${CC312_LEGACY_DRIVER_API_ENABLED}>:CC312_LEGACY_DRIVER_API_ENABLED>
 )
 
 cmake_policy(SET CMP0079 NEW)

bl2/ext/mcuboot/config/mcuboot-mbedtls-cfg.h

diff --git a/bl2/ext/mcuboot/config/mcuboot-mbedtls-cfg.h b/bl2/ext/mcuboot/config/mcuboot-mbedtls-cfg.h
index 66f03f0..49f2f13 100644
--- a/bl2/ext/mcuboot/config/mcuboot-mbedtls-cfg.h
+++ b/bl2/ext/mcuboot/config/mcuboot-mbedtls-cfg.h
@@ -82,7 +82,18 @@
 #endif /* CRYPTO_HW_ACCELERATOR_OTP_PROVISIONING */
 
 #ifdef CRYPTO_HW_ACCELERATOR
+#ifndef CC312_LEGACY_DRIVER_API_ENABLED
+/*
+ * Forcing the legacy driver API enabled all the time regardless of
+ * cmake configuration in BL2.
+ */
+#define CC312_LEGACY_DRIVER_API_ENABLED
+#warning "Use CC312 legacy driver API for BL2"
 #include "mbedtls_accelerator_config.h"
+#undef CC312_LEGACY_DRIVER_API_ENABLED
+#else
+#include "mbedtls_accelerator_config.h"
+#endif /* !CC312_LEGACY_DRIVER_API_ENABLED */
 #endif
 
 #endif /* __MCUBOOT_MBEDTLS_CFG__ */