Skip to content

Commit 54ba27d

Browse files
AhmedIsmail02AhmedIsmail02
authored
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 <[email protected]> * mbedtls: Bump to v3.6.3 release Signed-off-by: Ahmed Ismail <[email protected]> * 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 <[email protected]> * docs: Fix expected output for applications Signed-off-by: Ahmed Ismail <[email protected]> * 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 <[email protected]> --------- Signed-off-by: Ahmed Ismail <[email protected]>
1 parent bda0d25 commit 54ba27d

39 files changed

+790
-987
lines changed

‎.devcontainer/Dockerfile

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024 Arm Limited and/or its affiliates
1+
# Copyright 2024-2025 Arm Limited and/or its affiliates
22
# <[email protected]>
33
# SPDX-License-Identifier: MIT
44

@@ -26,6 +26,7 @@ RUN apt-get update && \
2626
gdb \
2727
lcov \
2828
libbz2-dev \
29+
libclang-14-dev \
2930
libffi-dev \
3031
libgdbm-dev \
3132
libgdbm-compat-dev \
@@ -74,6 +75,7 @@ RUN pip3 install \
7475
cbor \
7576
cbor2 \
7677
cffi \
78+
clang==14.0 \
7779
cmake \
7880
imgtool \
7981
intelhex \
@@ -83,10 +85,19 @@ RUN pip3 install \
8385
pyelftools \
8486
pyhsslms \
8587
PyYaml \
88+
rich \
8689
setuptools \
8790
towncrier \
8891
wheel
8992

93+
# This is needed to define where the libclang shared object is located
94+
ENV LD_LIBRARY_PATH="/usr/lib/llvm-14/lib:${LD_LIBRARY_PATH}"
95+
96+
# This is needed for the GDB debugger to work
97+
RUN sudo add-apt-repository -y ppa:deadsnakes/ppa && \
98+
sudo apt-get update && \
99+
sudo apt-get -y install python3.8 libpython3.8 libpython3.8-dev
100+
90101
# Create the user
91102
RUN groupadd --gid $USER_GID $USERNAME \
92103
&& useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \

‎.github/.cSpellWords.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ Cqqpk
4545
CSRS
4646
ctest
4747
Customisation
48+
CYBW
4849
DACTIVATION
4950
DARM
5051
DCMAKE
@@ -165,6 +166,8 @@ nents
165166
NIOS
166167
NSPE
167168
NVIC
169+
Nyhq
170+
obec
168171
ohmyzsh
169172
Onoa
170173
OPTIM
@@ -258,6 +261,7 @@ Werror
258261
WGHT
259262
wght
260263
WLATENCY
264+
WZYKHR
261265
Xcycu
262266
xtea
263267
Xwzpc

‎.github/workflows/build.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ jobs:
4444
- name: Install build dependencies
4545
shell: bash
4646
run: |
47-
pip install cmake ninja imgtool cffi intelhex cbor2 cbor jinja2 PyYaml pyelftools pyhsslms
47+
pip install cmake ninja imgtool cffi intelhex cbor2 cbor jinja2 PyYaml pyelftools pyhsslms clang==14.0 rich
4848
sudo apt-get -y update
49-
sudo apt-get -y install srecord libsndfile1-dev
49+
sudo apt-get -y install srecord libsndfile1-dev libclang-14-dev
5050
- name: Install GNU Arm toolchain
5151
shell: bash
5252
run: |
@@ -67,6 +67,10 @@ jobs:
6767
git config --global user.email "[email protected]"
6868
git config --global user.name "ci"
6969
git config --global core.autocrlf input
70+
- name: Set up LD_LIBRARY_PATH
71+
shell: bash
72+
run: |
73+
echo "LD_LIBRARY_PATH=/usr/lib/llvm-14/lib:\$LD_LIBRARY_PATH" >> $GITHUB_ENV
7074
- name: Build ${{ matrix.application }} application
7175
shell: bash
7276
run: |

‎.vscode/tasks.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2021-2024 Arm Limited and/or its affiliates
1+
// Copyright 2021-2025 Arm Limited and/or its affiliates
22
// <[email protected]>
33
// SPDX-License-Identifier: MIT
44

@@ -40,7 +40,7 @@
4040
"${input:FRITarget}",
4141
"${input:FRICameraFramesPath}",
4242
"${input:FRIBuildDirectory}",
43-
"${input:FRIDisplay}"
43+
"${input:FRIHdLcdGui}"
4444
],
4545
"options": {
4646
"cwd": "${workspaceFolder}"
@@ -65,7 +65,7 @@
6565
"${input:FRIBuildDirectory}",
6666
"${input:FRICameraFramesPath}",
6767
"${input:FRIGdbDebuggerPlugin}",
68-
"${input:FRIDisplay}"
68+
"${input:FRIHdLcdGui}"
6969
],
7070
"options": {
7171
"cwd": "${workspaceFolder}"
@@ -161,13 +161,13 @@
161161
},
162162
{
163163
"type": "pickString",
164-
"id": "FRIDisplay",
165-
"description": "Is display (GUI) available?",
164+
"id": "FRIHdLcdGui",
165+
"description": "Is HDLCD GUI available?",
166166
"options": [
167-
"-Dtrue",
168-
"-Dfalse"
167+
"-Gtrue",
168+
"-Gfalse"
169169
],
170-
"default": "-Dfalse"
170+
"default": "-Gfalse"
171171
},
172172
]
173173
}

‎applications/blinky/tests/corstone300_pass_output.log

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Waiting for provisioning bundle
22
Running provisioning bundle
3-
Booting TF-M v2.1.1
3+
Booting TF-M v2.2.0
44
psa_framework_version is: 257
55
LED on
66
LED off

‎applications/blinky/tests/corstone310_pass_output.log

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Waiting for provisioning bundle
22
Running provisioning bundle
3-
Booting TF-M v2.1.1
3+
Booting TF-M v2.2.0
44
psa_framework_version is: 257
55
LED on
66
LED off

‎applications/blinky/tests/corstone315_pass_output.log

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Waiting for DM provisioning bundle
22
Running DM provisioning bundle
3-
Booting TF-M v2.1.1
3+
Booting TF-M v2.2.0
44
psa_framework_version is: 257
55
LED on
66
LED off

‎applications/blinky/tests/corstone320_pass_output.log

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Waiting for DM provisioning bundle
22
Running DM provisioning bundle
3-
Booting TF-M v2.1.1
3+
Booting TF-M v2.2.0
44
psa_framework_version is: 257
55
LED on
66
LED off

‎applications/keyword_detection/configs/freertos_config/FreeRTOSConfig.h

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* FreeRTOS Kernel V10.4.1
33
* Copyright (C) 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4-
* Copyright (c) 2022, Arm Limited and Contributors. All rights reserved.
4+
* Copyright (c) 2022-2025, Arm Limited and Contributors. All rights reserved.
55
*
66
* Permission is hereby granted, free of charge, to any person obtaining a copy of
77
* this software and associated documentation files (the "Software"), to deal in
@@ -35,6 +35,12 @@
3535

3636
#include "app_config.h"
3737

38+
/* *INDENT-OFF* */
39+
#ifdef __cplusplus
40+
extern "C" {
41+
#endif
42+
/* *INDENT-ON* */
43+
3844
#ifndef __USED
3945
#define __USED __attribute__( ( used ) )
4046
#endif
@@ -234,4 +240,10 @@ void vLoggingPrintf( const char * pcFormat,
234240

235241
#define democonfigNETWORK_TYPES ( AWSIOT_NETWORK_TYPE_ETH )
236242

243+
/* *INDENT-OFF* */
244+
#ifdef __cplusplus
245+
}
246+
#endif
247+
/* *INDENT-ON* */
248+
237249
#endif /* FREERTOS_CONFIG_H */

‎applications/keyword_detection/tests/corstone300_model_pass_output.log

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Waiting for provisioning bundle
22
Running provisioning bundle
3-
Secure Component (ID 0) version=2.1.1
3+
Secure Component (ID 0) version=2.2.0
44
Non-Secure Component (ID 1) version=0.0.10
55
ML Model Component (ID 2) version=0.0.11
66
Starting bootloader
7-
Booting TF-M v2.1.1
7+
Booting TF-M v2.2.0
88
PSA Framework version is: 257
9-
Secure Component (ID 0) version=2.1.1
9+
Secure Component (ID 0) version=2.2.0
1010
Non-Secure Component (ID 1) version=0.0.10
1111
ML Model Component (ID 2) version=0.0.42
1212
ML interface initialised

‎applications/keyword_detection/tests/corstone300_pass_output.log

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Waiting for provisioning bundle
22
Running provisioning bundle
3-
Secure Component (ID 0) version=2.1.1
3+
Secure Component (ID 0) version=2.2.0
44
Non-Secure Component (ID 1) version=0.0.10
55
Starting bootloader
6-
Booting TF-M v2.1.1
6+
Booting TF-M v2.2.0
77
PSA Framework version is: 257
8-
Secure Component (ID 0) version=2.1.1
8+
Secure Component (ID 0) version=2.2.0
99
Non-Secure Component (ID 1) version=0.0.20
1010
ML interface initialised
1111
ML_HEARD_ON

‎applications/keyword_detection/tests/corstone310_model_pass_output.log

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Waiting for provisioning bundle
22
Running provisioning bundle
3-
Secure Component (ID 0) version=2.1.1
3+
Secure Component (ID 0) version=2.2.0
44
Non-Secure Component (ID 1) version=0.0.10
55
ML Model Component (ID 2) version=0.0.11
66
Starting bootloader
7-
Booting TF-M v2.1.1
7+
Booting TF-M v2.2.0
88
PSA Framework version is: 257
9-
Secure Component (ID 0) version=2.1.1
9+
Secure Component (ID 0) version=2.2.0
1010
Non-Secure Component (ID 1) version=0.0.10
1111
ML Model Component (ID 2) version=0.0.42
1212
ML interface initialised

‎applications/keyword_detection/tests/corstone310_pass_output.log

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Waiting for provisioning bundle
22
Running provisioning bundle
3-
Secure Component (ID 0) version=2.1.1
3+
Secure Component (ID 0) version=2.2.0
44
Non-Secure Component (ID 1) version=0.0.10
55
Starting bootloader
6-
Booting TF-M v2.1.1
6+
Booting TF-M v2.2.0
77
PSA Framework version is: 257
8-
Secure Component (ID 0) version=2.1.1
8+
Secure Component (ID 0) version=2.2.0
99
Non-Secure Component (ID 1) version=0.0.20
1010
ML interface initialised
1111
ML_HEARD_ON

‎applications/keyword_detection/tests/corstone315_model_pass_output.log

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Waiting for DM provisioning bundle
22
Running DM provisioning bundle
3-
Secure Component (ID 0) version=2.1.1
3+
Secure Component (ID 0) version=2.2.0
44
Non-Secure Component (ID 1) version=0.0.10
55
ML Model Component (ID 2) version=0.0.11
66
Starting bootloader
7-
Booting TF-M v2.1.1
7+
Booting TF-M v2.2.0
88
PSA Framework version is: 257
9-
Secure Component (ID 0) version=2.1.1
9+
Secure Component (ID 0) version=2.2.0
1010
Non-Secure Component (ID 1) version=0.0.10
1111
ML Model Component (ID 2) version=0.0.42
1212
ML interface initialised

‎applications/keyword_detection/tests/corstone315_pass_output.log

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Waiting for DM provisioning bundle
22
Running DM provisioning bundle
3-
Secure Component (ID 0) version=2.1.1
3+
Secure Component (ID 0) version=2.2.0
44
Non-Secure Component (ID 1) version=0.0.10
55
Starting bootloader
6-
Booting TF-M v2.1.1
6+
Booting TF-M v2.2.0
77
PSA Framework version is: 257
8-
Secure Component (ID 0) version=2.1.1
8+
Secure Component (ID 0) version=2.2.0
99
Non-Secure Component (ID 1) version=0.0.20
1010
ML interface initialised
1111
ML_HEARD_ON

‎applications/keyword_detection/tests/corstone320_model_pass_output.log

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Waiting for DM provisioning bundle
22
Running DM provisioning bundle
3-
Secure Component (ID 0) version=2.1.1
3+
Secure Component (ID 0) version=2.2.0
44
Non-Secure Component (ID 1) version=0.0.10
55
ML Model Component (ID 2) version=0.0.11
66
Starting bootloader
7-
Booting TF-M v2.1.1
7+
Booting TF-M v2.2.0
88
PSA Framework version is: 257
9-
Secure Component (ID 0) version=2.1.1
9+
Secure Component (ID 0) version=2.2.0
1010
Non-Secure Component (ID 1) version=0.0.10
1111
ML Model Component (ID 2) version=0.0.42
1212
ML interface initialised

‎applications/keyword_detection/tests/corstone320_pass_output.log

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Waiting for DM provisioning bundle
22
Running DM provisioning bundle
3-
Secure Component (ID 0) version=2.1.1
3+
Secure Component (ID 0) version=2.2.0
44
Non-Secure Component (ID 1) version=0.0.10
55
Starting bootloader
6-
Booting TF-M v2.1.1
6+
Booting TF-M v2.2.0
77
PSA Framework version is: 257
8-
Secure Component (ID 0) version=2.1.1
8+
Secure Component (ID 0) version=2.2.0
99
Non-Secure Component (ID 1) version=0.0.20
1010
ML interface initialised
1111
ML_HEARD_ON

‎applications/object_detection/configs/freertos_config/FreeRTOSConfig.h

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* FreeRTOS Kernel V10.4.1
33
* Copyright (C) 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4-
* Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
4+
* Copyright (c) 2022-2025, Arm Limited and Contributors. All rights reserved.
55
*
66
* Permission is hereby granted, free of charge, to any person obtaining a copy of
77
* this software and associated documentation files (the "Software"), to deal in
@@ -35,6 +35,12 @@
3535

3636
#include "app_config.h"
3737

38+
/* *INDENT-OFF* */
39+
#ifdef __cplusplus
40+
extern "C" {
41+
#endif
42+
/* *INDENT-ON* */
43+
3844
#ifndef __USED
3945
#define __USED __attribute__( ( used ) )
4046
#endif
@@ -234,4 +240,10 @@ void vLoggingPrintf( const char * pcFormat,
234240

235241
#define democonfigNETWORK_TYPES ( AWSIOT_NETWORK_TYPE_ETH )
236242

243+
/* *INDENT-OFF* */
244+
#ifdef __cplusplus
245+
}
246+
#endif
247+
/* *INDENT-ON* */
248+
237249
#endif /* FREERTOS_CONFIG_H */

‎applications/object_detection/tests/corstone300_pass_output.log

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Waiting for provisioning bundle
22
Running provisioning bundle
3-
Secure Component (ID 0) version=2.1.1
3+
Secure Component (ID 0) version=2.2.0
44
Non-Secure Component (ID 1) version=0.0.10
55
Starting bootloader
6-
Booting TF-M v2.1.1
6+
Booting TF-M v2.2.0
77
PSA Framework version is: 257
8-
Secure Component (ID 0) version=2.1.1
8+
Secure Component (ID 0) version=2.2.0
99
Non-Secure Component (ID 1) version=0.0.20
1010
Complete recognition: Detected faces: 2
1111
Complete recognition: Detected faces: 2

‎applications/object_detection/tests/corstone310_pass_output.log

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Waiting for provisioning bundle
22
Running provisioning bundle
3-
Secure Component (ID 0) version=2.1.1
3+
Secure Component (ID 0) version=2.2.0
44
Non-Secure Component (ID 1) version=0.0.10
55
Starting bootloader
6-
Booting TF-M v2.1.1
6+
Booting TF-M v2.2.0
77
PSA Framework version is: 257
8-
Secure Component (ID 0) version=2.1.1
8+
Secure Component (ID 0) version=2.2.0
99
Non-Secure Component (ID 1) version=0.0.20
1010
Complete recognition: Detected faces: 2
1111
Complete recognition: Detected faces: 2

‎applications/object_detection/tests/corstone315_pass_output.log

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Waiting for DM provisioning bundle
22
Running DM provisioning bundle
3-
Secure Component (ID 0) version=2.1.1
3+
Secure Component (ID 0) version=2.2.0
44
Non-Secure Component (ID 1) version=0.0.10
55
Starting bootloader
6-
Booting TF-M v2.1.1
6+
Booting TF-M v2.2.0
77
PSA Framework version is: 257
8-
Secure Component (ID 0) version=2.1.1
8+
Secure Component (ID 0) version=2.2.0
99
Non-Secure Component (ID 1) version=0.0.20
1010
Complete recognition: Detected faces: 2
1111
Complete recognition: Detected faces: 2

0 commit comments

Comments
 (0)