From b2905b087d3fc49e5c5f063cc5a4cf29c8087b4d Mon Sep 17 00:00:00 2001 From: Chun-Chieh Li Date: Thu, 8 Jul 2021 09:26:55 +0800 Subject: [PATCH] Fix compile error for Mbed TF-M V8M target Fix compile error for Mbed TF-M V8M target, usually without FLASHIAP 1. Use DEVICE_FLASH to exclude FLASHIAP code 2. Fix MBED_MAJOR_VERSION doesn't get in to exclude mbedtls_psa_crypto_free(). --- .../psa-driver/source/psa_driver_crypto.c | 1 + .../OS_Specific/mbedOS/Update/pal_plat_update.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/factory-configurator-client/psa-driver/source/psa_driver_crypto.c b/factory-configurator-client/psa-driver/source/psa_driver_crypto.c index 7f4a28aed..1f99b3863 100644 --- a/factory-configurator-client/psa-driver/source/psa_driver_crypto.c +++ b/factory-configurator-client/psa-driver/source/psa_driver_crypto.c @@ -14,6 +14,7 @@ // limitations under the License. // ---------------------------------------------------------------------------- #ifdef MBED_CONF_MBED_CLOUD_CLIENT_PSA_SUPPORT +#include "platform/mbed_version.h" #include "psa_driver.h" #include "psa/protected_storage.h" #include "psa/crypto.h" diff --git a/mbed-client-pal/Source/Port/Reference-Impl/OS_Specific/mbedOS/Update/pal_plat_update.cpp b/mbed-client-pal/Source/Port/Reference-Impl/OS_Specific/mbedOS/Update/pal_plat_update.cpp index c5af159c1..4e5aa6f2a 100644 --- a/mbed-client-pal/Source/Port/Reference-Impl/OS_Specific/mbedOS/Update/pal_plat_update.cpp +++ b/mbed-client-pal/Source/Port/Reference-Impl/OS_Specific/mbedOS/Update/pal_plat_update.cpp @@ -60,6 +60,7 @@ palStatus_t pal_plat_imageActivate(palImageId_t imageId) palStatus_t pal_plat_imageGetActiveHash(palBuffer_t *hash) { +#if DEVICE_FLASH palStatus_t ret = PAL_ERR_UPDATE_ERROR; uint32_t read_offset = PAL_UPDATE_ACTIVE_METADATA_HEADER_OFFSET + offsetof(FirmwareHeader_t, firmwareSHA256); @@ -95,6 +96,9 @@ palStatus_t pal_plat_imageGetActiveHash(palBuffer_t *hash) exit: return ret; +#else + return PAL_ERR_NOT_IMPLEMENTED; +#endif } palStatus_t pal_plat_imageGetActiveVersion (palBuffer_t* version)