Device: Fixed ARMv81MML partition file to recognize MVE usage.
When __ARM_FEATURE_MVE is defined the security settings for CP10/CP11
need to be set similar to FPU usage.
* @file partition_ARMv81MML.h
* @brief CMSIS-CORE Initial Setup for Secure / Non-Secure Zones for Armv8.1-M Mainline
* @version V1.0.1
- * @date 20. March 2020
+ * @date 26. March 2020
******************************************************************************/
/*
* Copyright (c) 2009-2020 Arm Limited. All rights reserved.
@@ -1177,8 +1177,9 @@ __STATIC_INLINE void TZ_SAU_Setup (void)
((SCB_AIRCR_BFHFNMINS_VAL << SCB_AIRCR_BFHFNMINS_Pos) & SCB_AIRCR_BFHFNMINS_Msk);
#endif /* defined (SCB_CSR_AIRCR_INIT) && (SCB_CSR_AIRCR_INIT == 1U) */
- #if defined (__FPU_USED) && (__FPU_USED == 1U) && \
- defined (TZ_FPU_NS_USAGE) && (TZ_FPU_NS_USAGE == 1U)
+ #if (((defined (__FPU_USED) && (__FPU_USED == 1U)) || \
+ (defined (__ARM_FEATURE_MVE) && (__ARM_FEATURE_MVE > 0))) && \
+ (defined (TZ_FPU_NS_USAGE) && (TZ_FPU_NS_USAGE == 1U)))
SCB->NSACR = (SCB->NSACR & ~(SCB_NSACR_CP10_Msk | SCB_NSACR_CP11_Msk)) |
((SCB_NSACR_CP10_11_VAL << SCB_NSACR_CP10_Pos) & (SCB_NSACR_CP10_Msk | SCB_NSACR_CP11_Msk));
