cmsis: Update to v6.2.0

CPPWR SU(S)10 and 11 defines are in CMSIS v6.2.0, so
TFM's own definitions of these bits can be removed.

Signed-off-by: Dávid Házi <[email protected]>
Change-Id: Idcc084ba75d4732ee6260232b3c079be223ec738

Author: david-hazi-arm

lib/ext/cmsis/CMakeLists.txt

@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2024, Arm Limited. All rights reserved.
+# SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.21)
 
 # Default configuration of CMSIS repository
 set(CMSIS_PATH     "DOWNLOAD"       CACHE PATH      "Path to cmsis (or DOWNLOAD to fetch automatically")
-set(CMSIS_TAG      "v6.1.0"         CACHE STRING    "The version of cmsis to use")
+set(CMSIS_TAG      "v6.2.0"         CACHE STRING    "The version of cmsis to use")
 
 fetch_remote_library(
     LIB_NAME                cmsis

platform/ext/common/core_ext.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2024, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2025, Arm Limited. All rights reserved.
  * Copyright (c) 2022-2024 Cypress Semiconductor Corporation (an Infineon
  * company) or an affiliate of Cypress Semiconductor Corporation. All rights
  * reserved.
@@ -20,7 +20,6 @@
 #include "tfm_hal_device_header.h"
 #include "tfm_svcalls.h"
 #include "utilities.h"
-#include "core_ext.h"
 #include "ffm/backend.h"
 
 #if !defined(__ARM_ARCH_8M_MAIN__) && !defined(__ARM_ARCH_8_1M_MAIN__)
@@ -353,7 +352,7 @@ void tfm_arch_config_extensions(void)
 #else
     SCnSCB->CPPWR |=
 #endif
-        SCnSCB_CPPWR_SUS11_Msk | SCnSCB_CPPWR_SUS10_Msk;
+        ICB_CPPWR_SUS11_Msk | ICB_CPPWR_SUS10_Msk;
 
 #endif /* CONFIG_TFM_FLOAT_ABI >= 1 */