Skip to content

Commit 40390fc

Browse files
AhmedIsmail02AhmedIsmail02
committed
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]>
1 parent 690b8f9 commit 40390fc

28 files changed

+111
-362
lines changed

‎.devcontainer/Dockerfile‎

Lines changed: 7 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,14 @@ 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+
9096
# Create the user
9197
RUN groupadd --gid $USER_GID $USERNAME \
9298
&& useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \

‎.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: |

‎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/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

0 commit comments

Comments
 (0)