From 9b515f44a9fbf37e99fe7e5702ab8fcb065d4888 Mon Sep 17 00:00:00 2001 From: Chun-Chieh Li Date: Wed, 18 Aug 2021 10:51:17 +0800 Subject: [PATCH] Fix compile error for Mbed TF-M V8M target Fix compile error for Mbed TF-M V8M target, usually without FLASHIAP. In arm_uc_config.h: 1. Use DEVICE_FLASH as requirement to enable ARM_UC_FEATURE_PAL_FLASHIAP 2. Use ARM_UC_FEATURE_PAL_FLASHIAP as requirement to enable ARM_UC_FEATURE_PAL_FILESYSTEM --- .../modules/common/update-client-common/arm_uc_config.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/update-client-hub/modules/common/update-client-common/arm_uc_config.h b/update-client-hub/modules/common/update-client-common/arm_uc_config.h index 5e8a414f..7556d223 100644 --- a/update-client-hub/modules/common/update-client-common/arm_uc_config.h +++ b/update-client-hub/modules/common/update-client-common/arm_uc_config.h @@ -365,13 +365,18 @@ ARM_UC_FEATURE_SIMPLE_COAP_SOURCE #if defined(TARGET_LIKE_MBED) #if !defined (ARM_UC_FEATURE_PAL_FLASHIAP_MCUBOOT) || (ARM_UC_FEATURE_PAL_FLASHIAP_MCUBOOT == 0) +#if DEVICE_FLASH #define ARM_UC_FEATURE_PAL_FLASHIAP 1 #endif #endif +#endif #if defined(ARM_UC_PROFILE_MBED_CLOUD_CLIENT) && (ARM_UC_PROFILE_MBED_CLOUD_CLIENT == 1) /* turn on all possible implementations */ +/* For Mbed, ARM_UC_FEATURE_PAL_FILESYSTEM relies on ARM_UC_FEATURE_PAL_FLASHIAP. */ +#if !defined(TARGET_LIKE_MBED) || (defined(ARM_UC_FEATURE_PAL_FLASHIAP) && (ARM_UC_FEATURE_PAL_FLASHIAP == 1)) #define ARM_UC_FEATURE_PAL_FILESYSTEM 1 +#endif #define ARM_UC_FEATURE_PAL_LINUX 1 #define ARM_UC_FEATURE_PAL_RTL8195AM 1