Device: Replaced __MVE_USED with __ARM_FEATURE_MVE on Armv8.1-M devices.

Change-Id: I88dce50f659d6a4017ce640618adecb638b905cd
6 years ago · 2e712fe8a8
parent b72b4e46e9
commit 2e712fe8a8
15 changed files with 47 additions and 47 deletions
--- a/Examples/ARM/arm_bayes_example/RTE/Device/ARMCM55/system_ARMCM55.c
+++ b/Examples/ARM/arm_bayes_example/RTE/Device/ARMCM55/system_ARMCM55.c
@ -3,10 +3,10 @@
 * @brief    CMSIS Device System Source File for
 *           ARMCM55 Device
 * @version  V1.0.0
- * @date     20. February 2020
+ * @date     23. March 2020
 ******************************************************************************/
 /*
- * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2020 Arm Limited. All rights reserved.
 *
 * SPDX-License-Identifier: Apache-2.0
 *
@ -73,7 +73,7 @@ void SystemInit (void)
 #endif

 #if (defined (__FPU_USED) && (__FPU_USED == 1U)) || \
-    (defined (__MVE_USED) && (__MVE_USED == 1U))
+    (defined (__ARM_FEATURE_MVE) && (__ARM_FEATURE_MVE > 0U))
  SCB->CPACR |= ((3U << 10U*2U) |           /* enable CP10 Full Access */
                 (3U << 11U*2U)  );         /* enable CP11 Full Access */
 #endif
--- a/Examples/ARM/arm_class_marks_example/RTE/Device/ARMCM55/system_ARMCM55.c
+++ b/Examples/ARM/arm_class_marks_example/RTE/Device/ARMCM55/system_ARMCM55.c
@ -3,10 +3,10 @@
 * @brief    CMSIS Device System Source File for
 *           ARMCM55 Device
 * @version  V1.0.0
- * @date     20. February 2020
+ * @date     23. March 2020
 ******************************************************************************/
 /*
- * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2020 Arm Limited. All rights reserved.
 *
 * SPDX-License-Identifier: Apache-2.0
 *
@ -73,7 +73,7 @@ void SystemInit (void)
 #endif

 #if (defined (__FPU_USED) && (__FPU_USED == 1U)) || \
-    (defined (__MVE_USED) && (__MVE_USED == 1U))
+    (defined (__ARM_FEATURE_MVE) && (__ARM_FEATURE_MVE > 0U))
  SCB->CPACR |= ((3U << 10U*2U) |           /* enable CP10 Full Access */
                 (3U << 11U*2U)  );         /* enable CP11 Full Access */
 #endif
--- a/Examples/ARM/arm_convolution_example/RTE/Device/ARMCM55/system_ARMCM55.c
+++ b/Examples/ARM/arm_convolution_example/RTE/Device/ARMCM55/system_ARMCM55.c
@ -3,10 +3,10 @@
 * @brief    CMSIS Device System Source File for
 *           ARMCM55 Device
 * @version  V1.0.0
- * @date     20. February 2020
+ * @date     23. March 2020
 ******************************************************************************/
 /*
- * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2020 Arm Limited. All rights reserved.
 *
 * SPDX-License-Identifier: Apache-2.0
 *
@ -73,7 +73,7 @@ void SystemInit (void)
 #endif

 #if (defined (__FPU_USED) && (__FPU_USED == 1U)) || \
-    (defined (__MVE_USED) && (__MVE_USED == 1U))
+    (defined (__ARM_FEATURE_MVE) && (__ARM_FEATURE_MVE > 0U))
  SCB->CPACR |= ((3U << 10U*2U) |           /* enable CP10 Full Access */
                 (3U << 11U*2U)  );         /* enable CP11 Full Access */
 #endif
--- a/Examples/ARM/arm_dotproduct_example/RTE/Device/ARMCM55/system_ARMCM55.c
+++ b/Examples/ARM/arm_dotproduct_example/RTE/Device/ARMCM55/system_ARMCM55.c
@ -3,10 +3,10 @@
 * @brief    CMSIS Device System Source File for
 *           ARMCM55 Device
 * @version  V1.0.0
- * @date     20. February 2020
+ * @date     23. March 2020
 ******************************************************************************/
 /*
- * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2020 Arm Limited. All rights reserved.
 *
 * SPDX-License-Identifier: Apache-2.0
 *
@ -73,7 +73,7 @@ void SystemInit (void)
 #endif

 #if (defined (__FPU_USED) && (__FPU_USED == 1U)) || \
-    (defined (__MVE_USED) && (__MVE_USED == 1U))
+    (defined (__ARM_FEATURE_MVE) && (__ARM_FEATURE_MVE > 0U))
  SCB->CPACR |= ((3U << 10U*2U) |           /* enable CP10 Full Access */
                 (3U << 11U*2U)  );         /* enable CP11 Full Access */
 #endif
--- a/Examples/ARM/arm_fft_bin_example/RTE/Device/ARMCM55/system_ARMCM55.c
+++ b/Examples/ARM/arm_fft_bin_example/RTE/Device/ARMCM55/system_ARMCM55.c
@ -3,10 +3,10 @@
 * @brief    CMSIS Device System Source File for
 *           ARMCM55 Device
 * @version  V1.0.0
- * @date     20. February 2020
+ * @date     23. March 2020
 ******************************************************************************/
 /*
- * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2020 Arm Limited. All rights reserved.
 *
 * SPDX-License-Identifier: Apache-2.0
 *
@ -73,7 +73,7 @@ void SystemInit (void)
 #endif

 #if (defined (__FPU_USED) && (__FPU_USED == 1U)) || \
-    (defined (__MVE_USED) && (__MVE_USED == 1U))
+    (defined (__ARM_FEATURE_MVE) && (__ARM_FEATURE_MVE > 0U))
  SCB->CPACR |= ((3U << 10U*2U) |           /* enable CP10 Full Access */
                 (3U << 11U*2U)  );         /* enable CP11 Full Access */
 #endif
--- a/Examples/ARM/arm_fir_example/RTE/Device/ARMCM55/system_ARMCM55.c
+++ b/Examples/ARM/arm_fir_example/RTE/Device/ARMCM55/system_ARMCM55.c
@ -3,10 +3,10 @@
 * @brief    CMSIS Device System Source File for
 *           ARMCM55 Device
 * @version  V1.0.0
- * @date     20. February 2020
+ * @date     23. March 2020
 ******************************************************************************/
 /*
- * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2020 Arm Limited. All rights reserved.
 *
 * SPDX-License-Identifier: Apache-2.0
 *
@ -73,7 +73,7 @@ void SystemInit (void)
 #endif

 #if (defined (__FPU_USED) && (__FPU_USED == 1U)) || \
-    (defined (__MVE_USED) && (__MVE_USED == 1U))
+    (defined (__ARM_FEATURE_MVE) && (__ARM_FEATURE_MVE > 0U))
  SCB->CPACR |= ((3U << 10U*2U) |           /* enable CP10 Full Access */
                 (3U << 11U*2U)  );         /* enable CP11 Full Access */
 #endif
--- a/Examples/ARM/arm_graphic_equalizer_example/RTE/Device/ARMCM55/system_ARMCM55.c
+++ b/Examples/ARM/arm_graphic_equalizer_example/RTE/Device/ARMCM55/system_ARMCM55.c
@ -3,10 +3,10 @@
 * @brief    CMSIS Device System Source File for
 *           ARMCM55 Device
 * @version  V1.0.0
- * @date     20. February 2020
+ * @date     23. March 2020
 ******************************************************************************/
 /*
- * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2020 Arm Limited. All rights reserved.
 *
 * SPDX-License-Identifier: Apache-2.0
 *
@ -73,7 +73,7 @@ void SystemInit (void)
 #endif

 #if (defined (__FPU_USED) && (__FPU_USED == 1U)) || \
-    (defined (__MVE_USED) && (__MVE_USED == 1U))
+    (defined (__ARM_FEATURE_MVE) && (__ARM_FEATURE_MVE > 0U))
  SCB->CPACR |= ((3U << 10U*2U) |           /* enable CP10 Full Access */
                 (3U << 11U*2U)  );         /* enable CP11 Full Access */
 #endif
--- a/Examples/ARM/arm_linear_interp_example/RTE/Device/ARMCM55/system_ARMCM55.c
+++ b/Examples/ARM/arm_linear_interp_example/RTE/Device/ARMCM55/system_ARMCM55.c
@ -3,10 +3,10 @@
 * @brief    CMSIS Device System Source File for
 *           ARMCM55 Device
 * @version  V1.0.0
- * @date     20. February 2020
+ * @date     23. March 2020
 ******************************************************************************/
 /*
- * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2020 Arm Limited. All rights reserved.
 *
 * SPDX-License-Identifier: Apache-2.0
 *
@ -73,7 +73,7 @@ void SystemInit (void)
 #endif

 #if (defined (__FPU_USED) && (__FPU_USED == 1U)) || \
-    (defined (__MVE_USED) && (__MVE_USED == 1U))
+    (defined (__ARM_FEATURE_MVE) && (__ARM_FEATURE_MVE > 0U))
  SCB->CPACR |= ((3U << 10U*2U) |           /* enable CP10 Full Access */
                 (3U << 11U*2U)  );         /* enable CP11 Full Access */
 #endif
--- a/Examples/ARM/arm_matrix_example/RTE/Device/ARMCM55/system_ARMCM55.c
+++ b/Examples/ARM/arm_matrix_example/RTE/Device/ARMCM55/system_ARMCM55.c
@ -3,10 +3,10 @@
 * @brief    CMSIS Device System Source File for
 *           ARMCM55 Device
 * @version  V1.0.0
- * @date     20. February 2020
+ * @date     23. March 2020
 ******************************************************************************/
 /*
- * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2020 Arm Limited. All rights reserved.
 *
 * SPDX-License-Identifier: Apache-2.0
 *
@ -73,7 +73,7 @@ void SystemInit (void)
 #endif

 #if (defined (__FPU_USED) && (__FPU_USED == 1U)) || \
-    (defined (__MVE_USED) && (__MVE_USED == 1U))
+    (defined (__ARM_FEATURE_MVE) && (__ARM_FEATURE_MVE > 0U))
  SCB->CPACR |= ((3U << 10U*2U) |           /* enable CP10 Full Access */
                 (3U << 11U*2U)  );         /* enable CP11 Full Access */
 #endif
--- a/Examples/ARM/arm_signal_converge_example/RTE/Device/ARMCM55/system_ARMCM55.c
+++ b/Examples/ARM/arm_signal_converge_example/RTE/Device/ARMCM55/system_ARMCM55.c
@ -3,10 +3,10 @@
 * @brief    CMSIS Device System Source File for
 *           ARMCM55 Device
 * @version  V1.0.0
- * @date     20. February 2020
+ * @date     23. March 2020
 ******************************************************************************/
 /*
- * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2020 Arm Limited. All rights reserved.
 *
 * SPDX-License-Identifier: Apache-2.0
 *
@ -73,7 +73,7 @@ void SystemInit (void)
 #endif

 #if (defined (__FPU_USED) && (__FPU_USED == 1U)) || \
-    (defined (__MVE_USED) && (__MVE_USED == 1U))
+    (defined (__ARM_FEATURE_MVE) && (__ARM_FEATURE_MVE > 0U))
  SCB->CPACR |= ((3U << 10U*2U) |           /* enable CP10 Full Access */
                 (3U << 11U*2U)  );         /* enable CP11 Full Access */
 #endif
--- a/Examples/ARM/arm_sin_cos_example/RTE/Device/ARMCM55/system_ARMCM55.c
+++ b/Examples/ARM/arm_sin_cos_example/RTE/Device/ARMCM55/system_ARMCM55.c
@ -3,10 +3,10 @@
 * @brief    CMSIS Device System Source File for
 *           ARMCM55 Device
 * @version  V1.0.0
- * @date     20. February 2020
+ * @date     23. March 2020
 ******************************************************************************/
 /*
- * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2020 Arm Limited. All rights reserved.
 *
 * SPDX-License-Identifier: Apache-2.0
 *
@ -73,7 +73,7 @@ void SystemInit (void)
 #endif

 #if (defined (__FPU_USED) && (__FPU_USED == 1U)) || \
-    (defined (__MVE_USED) && (__MVE_USED == 1U))
+    (defined (__ARM_FEATURE_MVE) && (__ARM_FEATURE_MVE > 0U))
  SCB->CPACR |= ((3U << 10U*2U) |           /* enable CP10 Full Access */
                 (3U << 11U*2U)  );         /* enable CP11 Full Access */
 #endif
--- a/Examples/ARM/arm_svm_example/RTE/Device/ARMCM55/system_ARMCM55.c
+++ b/Examples/ARM/arm_svm_example/RTE/Device/ARMCM55/system_ARMCM55.c
@ -3,10 +3,10 @@
 * @brief    CMSIS Device System Source File for
 *           ARMCM55 Device
 * @version  V1.0.0
- * @date     20. February 2020
+ * @date     23. March 2020
 ******************************************************************************/
 /*
- * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2020 Arm Limited. All rights reserved.
 *
 * SPDX-License-Identifier: Apache-2.0
 *
@ -73,7 +73,7 @@ void SystemInit (void)
 #endif

 #if (defined (__FPU_USED) && (__FPU_USED == 1U)) || \
-    (defined (__MVE_USED) && (__MVE_USED == 1U))
+    (defined (__ARM_FEATURE_MVE) && (__ARM_FEATURE_MVE > 0U))
  SCB->CPACR |= ((3U << 10U*2U) |           /* enable CP10 Full Access */
                 (3U << 11U*2U)  );         /* enable CP11 Full Access */
 #endif
--- a/Examples/ARM/arm_variance_example/RTE/Device/ARMCM55/system_ARMCM55.c
+++ b/Examples/ARM/arm_variance_example/RTE/Device/ARMCM55/system_ARMCM55.c
@ -3,10 +3,10 @@
 * @brief    CMSIS Device System Source File for
 *           ARMCM55 Device
 * @version  V1.0.0
- * @date     20. February 2020
+ * @date     23. March 2020
 ******************************************************************************/
 /*
- * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2020 Arm Limited. All rights reserved.
 *
 * SPDX-License-Identifier: Apache-2.0
 *
@ -73,7 +73,7 @@ void SystemInit (void)
 #endif

 #if (defined (__FPU_USED) && (__FPU_USED == 1U)) || \
-    (defined (__MVE_USED) && (__MVE_USED == 1U))
+    (defined (__ARM_FEATURE_MVE) && (__ARM_FEATURE_MVE > 0U))
  SCB->CPACR |= ((3U << 10U*2U) |           /* enable CP10 Full Access */
                 (3U << 11U*2U)  );         /* enable CP11 Full Access */
 #endif
--- a/Platforms/FVP/ARMv81MML/system_ARMv81MML.c
+++ b/Platforms/FVP/ARMv81MML/system_ARMv81MML.c
@ -2,11 +2,11 @@
 * @file     system_ARMv81MML.c
 * @brief    CMSIS Device System Source File for
 *           Armv8.1-M Mainline Device Series
- * @version  V1.2.0
- * @date     23. July 2019
+ * @version  V1.2.1
+ * @date     23. March 2020
 ******************************************************************************/
 /*
- * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2020 Arm Limited. All rights reserved.
 *
 * SPDX-License-Identifier: Apache-2.0
 *
@ -78,7 +78,7 @@ void SystemInit (void)
 #endif

 #if (defined (__FPU_USED) && (__FPU_USED == 1U)) || \
-    (defined (__MVE_USED) && (__MVE_USED == 1U))
+    (defined (__ARM_FEATURE_MVE) && (__ARM_FEATURE_MVE > 0U))
  SCB->CPACR |= ((3U << 10U*2U) |           /* enable CP10 Full Access */
                 (3U << 11U*2U)  );         /* enable CP11 Full Access */
 #endif
--- a/Platforms/MPS3/ARMv81MML/system_ARMv81MML.c
+++ b/Platforms/MPS3/ARMv81MML/system_ARMv81MML.c
@ -2,11 +2,11 @@
 * @file     system_ARMv81MML.c
 * @brief    CMSIS Device System Source File for
 *           Armv8.1-M Mainline Device Series
- * @version  V1.2.0
- * @date     23. July 2019
+ * @version  V1.2.1
+ * @date     23. March 2020
 ******************************************************************************/
 /*
- * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2009-2020 Arm Limited. All rights reserved.
 *
 * SPDX-License-Identifier: Apache-2.0
 *
@ -279,7 +279,7 @@ void SystemInit (void)
 #endif

 #if (defined (__FPU_USED) && (__FPU_USED == 1U)) || \
-    (defined (__MVE_USED) && (__MVE_USED == 1U))
+    (defined (__ARM_FEATURE_MVE) && (__ARM_FEATURE_MVE > 0U))
  SCB->CPACR |= ((3U << 10U*2U) |           /* enable CP10 Full Access */
                 (3U << 11U*2U)  );         /* enable CP11 Full Access */
 #endif