Update examples to use latest tools

VladimirUmek · VladimirUmek · commit 9b63077b2cde · 2025-03-27T14:03:16.000+01:00
diff --git a/CMSIS/RTOS2/FreeRTOS/Examples/App/Hello/Hello.cproject.yml b/CMSIS/RTOS2/FreeRTOS/Examples/App/Hello/Hello.cproject.yml
@@ -10,7 +10,7 @@ project:
   components:
     - component: CMSIS:CORE
     - component: CMSIS:OS Tick:SysTick
-    - component: CMSIS:RTOS2:FreeRTOS
+    - component: CMSIS:RTOS2:FreeRTOS&Cortex-M
     - component: CMSIS-View:Event Recorder&Semihosting
     
     - component: RTOS&FreeRTOS:Core&Cortex-M
diff --git a/CMSIS/RTOS2/FreeRTOS/Examples/App/TrustZone/NonSecure/TZ_NonSecure.cproject.yml b/CMSIS/RTOS2/FreeRTOS/Examples/App/TrustZone/NonSecure/TZ_NonSecure.cproject.yml
@@ -11,7 +11,7 @@ project:
   components:
     - component: CMSIS:CORE
     - component: CMSIS:OS Tick:SysTick
-    - component: CMSIS:RTOS2:FreeRTOS
+    - component: CMSIS:RTOS2:FreeRTOS&Cortex-M
     - component: CMSIS-View:Event Recorder&Semihosting
     
     - component: RTOS&FreeRTOS:Core&Cortex-M Non-Secure
@@ -32,7 +32,7 @@ project:
     - group: Secure Library
       files:
         - file: ../Secure/library_nsc.h
-        - file: ../../../out/TZ_Secure/TZ_Secure_CMSE_Lib.o
+        - file: $cmse-lib(TZ_Secure)$
 
   layers:
     - layer: $Target-Layer$
diff --git a/CMSIS/RTOS2/FreeRTOS/Examples/Examples.csolution.yml b/CMSIS/RTOS2/FreeRTOS/Examples/Examples.csolution.yml
@@ -1,8 +1,29 @@
 solution:
-  created-for: CMSIS-Toolbox@2.0.0
-
+  created-for: CMSIS-Toolbox@2.8.0
   cdefault:
 
+  select-compiler:
+    - compiler: AC6
+    - compiler: GCC
+    - compiler: CLANG
+    - compiler: IAR
+
+  misc:
+    - for-compiler: GCC
+      Link:
+        - --specs=rdimon.specs
+
+    - for-compiler: CLANG
+      Link:
+        - -lcrt0-semihost
+        - -lsemihost
+
+    - for-compiler: IAR
+      C-CPP:
+        - -e
+      Link:
+        - --semihosting
+
   packs:
     - pack: ARM::CMSIS@>=6.0.0
     - pack: ARM::Cortex_DFP
diff --git a/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM0/fvp_config.txt b/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM0/fvp_config.txt
@@ -7,7 +7,6 @@ armcortexm0ct.semihosting-cwd=                        # (string, init-time) defa
 armcortexm0ct.semihosting-enable=1                    # (bool  , init-time) default = '1'      : Enable semihosting SVC traps. Applications that do not use semihosting must set this parameter to false.
 armcortexm0ct.semihosting-heap_base=0                 # (int   , init-time) default = '0x0'    : Virtual address of heap base
 armcortexm0ct.semihosting-heap_limit=0                # (int   , init-time) default = '0x20700000' : Virtual address of top of heap
-armcortexm0ct.semihosting-prefix=0                    # (bool  , init-time) default = '0'      : Prefix semihosting output with target instance name
 armcortexm0ct.semihosting-stack_base=0                # (int   , init-time) default = '0x20800000' : Virtual address of base of descending stack
 armcortexm0ct.semihosting-stack_limit=0               # (int   , init-time) default = '0x20700000' : Virtual address of stack limit
 fvp_mps2.mps2_visualisation.disable-visualisation=1   # (bool  , init-time) default = '0'      : Enable/disable visualisation
diff --git a/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM0plus/fvp_config.txt b/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM0plus/fvp_config.txt
@@ -8,7 +8,6 @@ armcortexm0plusct.semihosting-cwd=                    # (string, init-time) defa
 armcortexm0plusct.semihosting-enable=1                # (bool  , init-time) default = '1'      : Enable semihosting SVC traps. Applications that do not use semihosting must set this parameter to false.
 armcortexm0plusct.semihosting-heap_base=0             # (int   , init-time) default = '0x0'    : Virtual address of heap base
 armcortexm0plusct.semihosting-heap_limit=0            # (int   , init-time) default = '0x20700000' : Virtual address of top of heap
-armcortexm0plusct.semihosting-prefix=0                # (bool  , init-time) default = '0'      : Prefix semihosting output with target instance name
 armcortexm0plusct.semihosting-stack_base=0            # (int   , init-time) default = '0x20800000' : Virtual address of base of descending stack
 armcortexm0plusct.semihosting-stack_limit=0           # (int   , init-time) default = '0x20700000' : Virtual address of stack limit
 fvp_mps2.mps2_visualisation.disable-visualisation=1   # (bool  , init-time) default = '0'      : Enable/disable visualisation
diff --git a/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM23/fvp_config.txt b/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM23/fvp_config.txt
@@ -12,7 +12,6 @@ cpu0.semihosting-cwd=                                 # (string, init-time) defa
 cpu0.semihosting-enable=1                             # (bool  , init-time) default = '1'      : Enable semihosting SVC traps. Applications that do not use semihosting must set this parameter to false.
 cpu0.semihosting-heap_base=0                          # (int   , init-time) default = '0x0'    : Virtual address of heap base
 cpu0.semihosting-heap_limit=0                         # (int   , init-time) default = '0x20700000' : Virtual address of top of heap
-cpu0.semihosting-prefix=0                             # (bool  , init-time) default = '0'      : Prefix semihosting output with target instance name
 cpu0.semihosting-stack_base=0                         # (int   , init-time) default = '0x20800000' : Virtual address of base of descending stack
 cpu0.semihosting-stack_limit=0                        # (int   , init-time) default = '0x20700000' : Virtual address of stack limit
 fvp_mps2.DISABLE_GATING=1                             # (bool  , init-time) default = '0'      : Disable Memory gating logic
diff --git a/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM23_noTZ/fvp_config.txt b/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM23_noTZ/fvp_config.txt
@@ -12,7 +12,6 @@ cpu0.semihosting-cwd=                                 # (string, init-time) defa
 cpu0.semihosting-enable=1                             # (bool  , init-time) default = '1'      : Enable semihosting SVC traps. Applications that do not use semihosting must set this parameter to false.
 cpu0.semihosting-heap_base=0                          # (int   , init-time) default = '0x0'    : Virtual address of heap base
 cpu0.semihosting-heap_limit=0                         # (int   , init-time) default = '0x20700000' : Virtual address of top of heap
-cpu0.semihosting-prefix=0                             # (bool  , init-time) default = '0'      : Prefix semihosting output with target instance name
 cpu0.semihosting-stack_base=0                         # (int   , init-time) default = '0x20800000' : Virtual address of base of descending stack
 cpu0.semihosting-stack_limit=0                        # (int   , init-time) default = '0x20700000' : Virtual address of stack limit
 fvp_mps2.DISABLE_GATING=1                             # (bool  , init-time) default = '0'      : Disable Memory gating logic
diff --git a/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM3/fvp_config.txt b/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM3/fvp_config.txt
@@ -7,7 +7,6 @@ armcortexm3ct.semihosting-cwd=                        # (string, init-time) defa
 armcortexm3ct.semihosting-enable=1                    # (bool  , init-time) default = '1'      : Enable semihosting SVC traps. Applications that do not use semihosting must set this parameter to false.
 armcortexm3ct.semihosting-heap_base=0                 # (int   , init-time) default = '0x0'    : Virtual address of heap base
 armcortexm3ct.semihosting-heap_limit=0                # (int   , init-time) default = '0x20700000' : Virtual address of top of heap
-armcortexm3ct.semihosting-prefix=0                    # (bool  , init-time) default = '0'      : Prefix semihosting output with target instance name
 armcortexm3ct.semihosting-stack_base=0                # (int   , init-time) default = '0x20800000' : Virtual address of base of descending stack
 armcortexm3ct.semihosting-stack_limit=0               # (int   , init-time) default = '0x20700000' : Virtual address of stack limit
 fvp_mps2.mps2_visualisation.disable-visualisation=1   # (bool  , init-time) default = '0'      : Enable/disable visualisation
diff --git a/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM33/fvp_config.txt b/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM33/fvp_config.txt
@@ -12,7 +12,6 @@ cpu0.semihosting-cwd=                                 # (string, init-time) defa
 cpu0.semihosting-enable=1                             # (bool  , init-time) default = '1'      : Enable semihosting SVC traps. Applications that do not use semihosting must set this parameter to false.
 cpu0.semihosting-heap_base=0                          # (int   , init-time) default = '0x0'    : Virtual address of heap base
 cpu0.semihosting-heap_limit=0                         # (int   , init-time) default = '0x20700000' : Virtual address of top of heap
-cpu0.semihosting-prefix=0                             # (bool  , init-time) default = '0'      : Prefix semihosting output with target instance name
 cpu0.semihosting-stack_base=0                         # (int   , init-time) default = '0x20800000' : Virtual address of base of descending stack
 cpu0.semihosting-stack_limit=0                        # (int   , init-time) default = '0x20700000' : Virtual address of stack limit
 fvp_mps2.DISABLE_GATING=1                             # (bool  , init-time) default = '0'      : Disable Memory gating logic
diff --git a/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM33_noTZ/fvp_config.txt b/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM33_noTZ/fvp_config.txt
@@ -12,7 +12,6 @@ cpu0.semihosting-cwd=                                 # (string, init-time) defa
 cpu0.semihosting-enable=1                             # (bool  , init-time) default = '1'      : Enable semihosting SVC traps. Applications that do not use semihosting must set this parameter to false.
 cpu0.semihosting-heap_base=0                          # (int   , init-time) default = '0x0'    : Virtual address of heap base
 cpu0.semihosting-heap_limit=0                         # (int   , init-time) default = '0x20700000' : Virtual address of top of heap
-cpu0.semihosting-prefix=0                             # (bool  , init-time) default = '0'      : Prefix semihosting output with target instance name
 cpu0.semihosting-stack_base=0                         # (int   , init-time) default = '0x20800000' : Virtual address of base of descending stack
 cpu0.semihosting-stack_limit=0                        # (int   , init-time) default = '0x20700000' : Virtual address of stack limit
 fvp_mps2.DISABLE_GATING=1                             # (bool  , init-time) default = '0'      : Disable Memory gating logic
diff --git a/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM4/fvp_config.txt b/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM4/fvp_config.txt
@@ -7,7 +7,6 @@ armcortexm4ct.semihosting-cwd=                        # (string, init-time) defa
 armcortexm4ct.semihosting-enable=1                    # (bool  , init-time) default = '1'      : Enable semihosting SVC traps. Applications that do not use semihosting must set this parameter to false.
 armcortexm4ct.semihosting-heap_base=0                 # (int   , init-time) default = '0x0'    : Virtual address of heap base
 armcortexm4ct.semihosting-heap_limit=0                # (int   , init-time) default = '0x20700000' : Virtual address of top of heap
-armcortexm4ct.semihosting-prefix=0                    # (bool  , init-time) default = '0'      : Prefix semihosting output with target instance name
 armcortexm4ct.semihosting-stack_base=0                # (int   , init-time) default = '0x20800000' : Virtual address of base of descending stack
 armcortexm4ct.semihosting-stack_limit=0               # (int   , init-time) default = '0x20700000' : Virtual address of stack limit
 armcortexm4ct.vfp-present=1                           # (bool  , init-time) default = '1'      : Set whether the model has VFP support
diff --git a/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM55/fvp_config.txt b/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM55/fvp_config.txt
@@ -12,7 +12,6 @@ cpu0.semihosting-cwd=                                 # (string, init-time) defa
 cpu0.semihosting-enable=1                             # (bool  , init-time) default = '0'      : Enable semihosting SVC traps. Applications that do not use semihosting must set this parameter to false.
 cpu0.semihosting-heap_base=0                          # (int   , init-time) default = '0x0'    : Virtual address of heap base
 cpu0.semihosting-heap_limit=0                         # (int   , init-time) default = '0x20700000' : Virtual address of top of heap
-cpu0.semihosting-prefix=0                             # (bool  , init-time) default = '0'      : Prefix semihosting output with target instance name
 cpu0.semihosting-stack_base=0                         # (int   , init-time) default = '0x20800000' : Virtual address of base of descending stack
 cpu0.semihosting-stack_limit=0                        # (int   , init-time) default = '0x20700000' : Virtual address of stack limit
 mps3_board.DISABLE_GATING=1                           # (bool  , init-time) default = '0'      : Disable Memory gating logic
diff --git a/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM55_noTZ/fvp_config.txt b/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM55_noTZ/fvp_config.txt
@@ -12,7 +12,6 @@ cpu0.semihosting-cwd=                                 # (string, init-time) defa
 cpu0.semihosting-enable=1                             # (bool  , init-time) default = '0'      : Enable semihosting SVC traps. Applications that do not use semihosting must set this parameter to false.
 cpu0.semihosting-heap_base=0                          # (int   , init-time) default = '0x0'    : Virtual address of heap base
 cpu0.semihosting-heap_limit=0                         # (int   , init-time) default = '0x20700000' : Virtual address of top of heap
-cpu0.semihosting-prefix=0                             # (bool  , init-time) default = '0'      : Prefix semihosting output with target instance name
 cpu0.semihosting-stack_base=0                         # (int   , init-time) default = '0x20800000' : Virtual address of base of descending stack
 cpu0.semihosting-stack_limit=0                        # (int   , init-time) default = '0x20700000' : Virtual address of stack limit
 mps3_board.DISABLE_GATING=1                           # (bool  , init-time) default = '0'      : Disable Memory gating logic
diff --git a/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM7/fvp_config.txt b/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM7/fvp_config.txt
@@ -8,7 +8,6 @@ armcortexm7ct.semihosting-cwd=                        # (string, init-time) defa
 armcortexm7ct.semihosting-enable=1                    # (bool  , init-time) default = '1'      : Enable semihosting SVC traps. Applications that do not use semihosting must set this parameter to false.
 armcortexm7ct.semihosting-heap_base=0                 # (int   , init-time) default = '0x0'    : Virtual address of heap base
 armcortexm7ct.semihosting-heap_limit=0                # (int   , init-time) default = '0x20700000' : Virtual address of top of heap
-armcortexm7ct.semihosting-prefix=0                    # (bool  , init-time) default = '0'      : Prefix semihosting output with target instance name
 armcortexm7ct.semihosting-stack_base=0                # (int   , init-time) default = '0x20800000' : Virtual address of base of descending stack
 armcortexm7ct.semihosting-stack_limit=0               # (int   , init-time) default = '0x20700000' : Virtual address of stack limit
 armcortexm7ct.vfp-present=1                           # (bool  , init-time) default = '1'      : Set whether the model has VFP support
diff --git a/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM85/fvp_config.txt b/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM85/fvp_config.txt
@@ -10,7 +10,6 @@ cpu0.semihosting-cwd=                                 # (string, init-time) defa
 cpu0.semihosting-enable=1                             # (bool  , init-time) default = '0'      : Enable semihosting SVC traps. Applications that do not use semihosting must set this parameter to false.
 cpu0.semihosting-heap_base=0                          # (int   , init-time) default = '0x0'    : Virtual address of heap base
 cpu0.semihosting-heap_limit=0                         # (int   , init-time) default = '0x20700000' : Virtual address of top of heap
-cpu0.semihosting-prefix=0                             # (bool  , init-time) default = '0'      : Prefix semihosting output with target instance name
 cpu0.semihosting-stack_base=0                         # (int   , init-time) default = '0x20800000' : Virtual address of base of descending stack
 cpu0.semihosting-stack_limit=0                        # (int   , init-time) default = '0x20700000' : Virtual address of stack limit
 mps3_board.DISABLE_GATING=1                           # (bool  , init-time) default = '0'      : Disable Memory gating logic
diff --git a/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM85_noTZ/fvp_config.txt b/CMSIS/RTOS2/FreeRTOS/Examples/Target/CM85_noTZ/fvp_config.txt
@@ -10,10 +10,9 @@ cpu0.semihosting-cwd=                                 # (string, init-time) defa
 cpu0.semihosting-enable=1                             # (bool  , init-time) default = '0'      : Enable semihosting SVC traps. Applications that do not use semihosting must set this parameter to false.
 cpu0.semihosting-heap_base=0                          # (int   , init-time) default = '0x0'    : Virtual address of heap base
 cpu0.semihosting-heap_limit=0                         # (int   , init-time) default = '0x20700000' : Virtual address of top of heap
-cpu0.semihosting-prefix=0                             # (bool  , init-time) default = '0'      : Prefix semihosting output with target instance name
 cpu0.semihosting-stack_base=0                         # (int   , init-time) default = '0x20800000' : Virtual address of base of descending stack
 cpu0.semihosting-stack_limit=0                        # (int   , init-time) default = '0x20700000' : Virtual address of stack limit
 mps3_board.DISABLE_GATING=1                           # (bool  , init-time) default = '0'      : Disable Memory gating logic
-mps3_board.sse300.iotss3_systemcontrol.INITSVTOR_RST=0x11000000 # (int   , init-time) default = '0x11000000' : Reset value for INITSVTOR. Should match cpu<i>.INITSVTOR
+mps3_board.sse300.iotss3_systemcontrol.INITSVTOR_RST=0x11000000 # (int   , init-time) default = '0x11000000' : Reset int32_t for INITSVTOR. Should match cpu<i>.INITSVTOR : [0x0:0xffffff80]
 mps3_board.telnetterminal0.start_telnet=0             # (bool  , init-time) default = '1'      : Start telnet if nothing connected
 mps3_board.visualisation.disable-visualisation=1      # (bool  , init-time) default = '0'      : Enable/disable visualisation
diff --git a/CMSIS/RTOS2/FreeRTOS/Examples/cdefault.yml b/CMSIS/RTOS2/FreeRTOS/Examples/cdefault.yml
diff --git a/CMSIS/RTOS2/FreeRTOS/Examples/vcpkg-configuration.json b/CMSIS/RTOS2/FreeRTOS/Examples/vcpkg-configuration.json
@@ -7,15 +7,13 @@
         }
     ],
     "requires": {
-        "arm:tools/kitware/cmake": "3.28.4",
-        "arm:tools/ninja-build/ninja": "1.11.1",
-        "arm:tools/open-cmsis-pack/cmsis-toolbox": "2.3.0",
-
-        "arm:compilers/arm/armclang": "6.21.0",
-        "arm:compilers/arm/arm-none-eabi-gcc": "13.2.1",
-        "arm:compilers/arm/llvm-embedded": "17.0.1",
-
-        "arm:debuggers/arm/armdbg": "6.1.1",
-        "arm:models/arm/avh-fvp": "11.22.39"
+        "arm:tools/kitware/cmake": "3.31.5",
+        "arm:tools/ninja-build/ninja": "1.12.0",
+        "arm:tools/open-cmsis-pack/cmsis-toolbox": "2.8.0",
+        "arm:compilers/arm/armclang": "6.23.0",
+        "arm:compilers/arm/arm-none-eabi-gcc": "14.2.1",
+        "arm:compilers/arm/llvm-embedded": "19.1.5",
+        "arm:debuggers/arm/armdbg": "6.4.0",
+        "arm:models/arm/avh-fvp": "11.28.32"
     }
 }
