Update security libraries and FreeRTOS-Kernel (#112)

* freertos-kernel: Bump to v11.2.0 release

extern "C" is added to FreeRTOSConfig.h header
as previously in FreeRTOS-Kernel v11.1.0, the
extern "C" was added in the FreeRTOS.h header
before including FreeRTOSConfig.h header thus,
the configuration file implicitly had the
extern "C". However, the extern "C" in FreeRTOS.h
has been moved to be after the headers inclusion.
Hence, explicitly adding extern "C" that is needed
by CPP files to FreeRTOSConfig.h

Signed-off-by: Ahmed Ismail <Ahmed.Ismail@arm.com>

* mbedtls: Bump to v3.6.3 release

Signed-off-by: Ahmed Ismail <Ahmed.Ismail@arm.com>

* tf-m: Bump to v2.2.0 release

This commit includes the following changes:

- Install the needed python packages by TF-M v2.2.0
in the Docker image used by the development environment
and in GitHub workflow.

- Remove the ARMClang toolchain MVE patch as it's
part of TF-M v2.2.0 release.

- Add MPS4 dummy ROTPK provisioning patch because of
the defect mentioned in the patch file description field.

Signed-off-by: Ahmed Ismail <Ahmed.Ismail@arm.com>

* docs: Fix expected output for applications

Signed-off-by: Ahmed Ismail <Ahmed.Ismail@arm.com>

* devcontainer: Add some fixes and updates

This commit adds the following:

* Add the needed python packages for the
GDB debugger to work.

* Update the GUI option to match the one
in `tools/scripts/run.sh`.

Signed-off-by: Ahmed Ismail <Ahmed.Ismail@arm.com>

---------

Signed-off-by: Ahmed Ismail <Ahmed.Ismail@arm.com>

Author: AhmedIsmail02

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-# Copyright 2024 Arm Limited and/or its affiliates
+# Copyright 2024-2025 Arm Limited and/or its affiliates
 # <open-source-office@arm.com>
 # SPDX-License-Identifier: MIT
 
@@ -26,6 +26,7 @@ RUN apt-get update && \
     gdb \
     lcov \
     libbz2-dev \
+    libclang-14-dev \
     libffi-dev \
     libgdbm-dev \
     libgdbm-compat-dev \
@@ -74,6 +75,7 @@ RUN pip3 install \
     cbor \
     cbor2 \
     cffi \
+    clang==14.0 \
     cmake \
     imgtool \
     intelhex \
@@ -83,10 +85,19 @@ RUN pip3 install \
     pyelftools \
     pyhsslms \
     PyYaml \
+    rich \
     setuptools \
     towncrier \
     wheel
 
+# This is needed to define where the libclang shared object is located
+ENV LD_LIBRARY_PATH="/usr/lib/llvm-14/lib:${LD_LIBRARY_PATH}"
+
+# This is needed for the GDB debugger to work
+RUN sudo add-apt-repository -y ppa:deadsnakes/ppa && \
+    sudo apt-get update && \
+    sudo apt-get -y install python3.8 libpython3.8 libpython3.8-dev
+
 # Create the user
 RUN groupadd --gid $USER_GID $USERNAME \
     && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \

.github/.cSpellWords.txt

@@ -45,6 +45,7 @@ Cqqpk
 CSRS
 ctest
 Customisation
+CYBW
 DACTIVATION
 DARM
 DCMAKE
@@ -165,6 +166,8 @@ nents
 NIOS
 NSPE
 NVIC
+Nyhq
+obec
 ohmyzsh
 Onoa
 OPTIM
@@ -258,6 +261,7 @@ Werror
 WGHT
 wght
 WLATENCY
+WZYKHR
 Xcycu
 xtea
 Xwzpc

.github/workflows/build.yaml

@@ -44,9 +44,9 @@ jobs:
       - name: Install build dependencies
         shell: bash
         run: |
-          pip install cmake ninja imgtool cffi intelhex cbor2 cbor jinja2 PyYaml pyelftools pyhsslms
+          pip install cmake ninja imgtool cffi intelhex cbor2 cbor jinja2 PyYaml pyelftools pyhsslms clang==14.0 rich
           sudo apt-get -y update
-          sudo apt-get -y install srecord libsndfile1-dev
+          sudo apt-get -y install srecord libsndfile1-dev libclang-14-dev
       - name: Install GNU Arm toolchain
         shell: bash
         run: |
@@ -67,6 +67,10 @@ jobs:
           git config --global user.email "ci@example.com"
           git config --global user.name "ci"
           git config --global core.autocrlf input
+      - name: Set up LD_LIBRARY_PATH
+        shell: bash
+        run: |
+          echo "LD_LIBRARY_PATH=/usr/lib/llvm-14/lib:\$LD_LIBRARY_PATH" >> $GITHUB_ENV
       - name: Build ${{ matrix.application }} application
         shell: bash
         run: |

.vscode/tasks.json

@@ -1,4 +1,4 @@
-// Copyright 2021-2024 Arm Limited and/or its affiliates
+// Copyright 2021-2025 Arm Limited and/or its affiliates
 // <open-source-office@arm.com>
 // SPDX-License-Identifier: MIT
 
@@ -40,7 +40,7 @@
                 "${input:FRITarget}",
                 "${input:FRICameraFramesPath}",
                 "${input:FRIBuildDirectory}",
-                "${input:FRIDisplay}"
+                "${input:FRIHdLcdGui}"
             ],
             "options": {
                 "cwd": "${workspaceFolder}"
@@ -65,7 +65,7 @@
                 "${input:FRIBuildDirectory}",
                 "${input:FRICameraFramesPath}",
                 "${input:FRIGdbDebuggerPlugin}",
-                "${input:FRIDisplay}"
+                "${input:FRIHdLcdGui}"
             ],
             "options": {
                 "cwd": "${workspaceFolder}"
@@ -161,13 +161,13 @@
         },
         {
             "type": "pickString",
-            "id": "FRIDisplay",
-            "description": "Is display (GUI) available?",
+            "id": "FRIHdLcdGui",
+            "description": "Is HDLCD GUI available?",
             "options": [
-                "-Dtrue",
-                "-Dfalse"
+                "-Gtrue",
+                "-Gfalse"
             ],
-            "default": "-Dfalse"
+            "default": "-Gfalse"
         },
     ]
 }

applications/blinky/tests/corstone300_pass_output.log

@@ -1,6 +1,6 @@
 Waiting for provisioning bundle
 Running provisioning bundle
-Booting TF-M v2.1.1
+Booting TF-M v2.2.0
 psa_framework_version is: 257
 LED on
 LED off

applications/blinky/tests/corstone310_pass_output.log

@@ -1,6 +1,6 @@
 Waiting for provisioning bundle
 Running provisioning bundle
-Booting TF-M v2.1.1
+Booting TF-M v2.2.0
 psa_framework_version is: 257
 LED on
 LED off

applications/blinky/tests/corstone315_pass_output.log

@@ -1,6 +1,6 @@
 Waiting for DM provisioning bundle
 Running DM provisioning bundle
-Booting TF-M v2.1.1
+Booting TF-M v2.2.0
 psa_framework_version is: 257
 LED on
 LED off

applications/blinky/tests/corstone320_pass_output.log

@@ -1,6 +1,6 @@
 Waiting for DM provisioning bundle
 Running DM provisioning bundle
-Booting TF-M v2.1.1
+Booting TF-M v2.2.0
 psa_framework_version is: 257
 LED on
 LED off

applications/keyword_detection/configs/freertos_config/FreeRTOSConfig.h

@@ -1,7 +1,7 @@
 /*
  * FreeRTOS Kernel V10.4.1
  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Copyright (c) 2022, Arm Limited and Contributors. All rights reserved.
+ * Copyright (c) 2022-2025, Arm Limited and Contributors. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -35,6 +35,12 @@
 
 #include "app_config.h"
 
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+    extern "C" {
+#endif
+/* *INDENT-ON* */
+
 #ifndef   __USED
     #define __USED    __attribute__( ( used ) )
 #endif
@@ -234,4 +240,10 @@ void vLoggingPrintf( const char * pcFormat,
 
 #define democonfigNETWORK_TYPES       ( AWSIOT_NETWORK_TYPE_ETH )
 
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+    }
+#endif
+/* *INDENT-ON* */
+
 #endif /* FREERTOS_CONFIG_H */

applications/keyword_detection/tests/corstone300_model_pass_output.log

@@ -1,12 +1,12 @@
 Waiting for provisioning bundle
 Running provisioning bundle
-Secure Component (ID 0) version=2.1.1
+Secure Component (ID 0) version=2.2.0
 Non-Secure Component (ID 1) version=0.0.10
 ML Model Component (ID 2) version=0.0.11
 Starting bootloader
-Booting TF-M v2.1.1
+Booting TF-M v2.2.0
 PSA Framework version is: 257
-Secure Component (ID 0) version=2.1.1
+Secure Component (ID 0) version=2.2.0
 Non-Secure Component (ID 1) version=0.0.10
 ML Model Component (ID 2) version=0.0.42
 ML interface initialised