From d0f8e2938fc790d87c42b76f0f375cc68b968866 Mon Sep 17 00:00:00 2001 From: Olivier Deprez Date: Wed, 26 Mar 2025 13:18:19 +0000 Subject: [PATCH 1/3] docker: add poetry to Dockerfile.full Required by TF-A to build secure partition packages in the 4 worlds config. Signed-off-by: Olivier Deprez --- docker/Dockerfile.full | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/Dockerfile.full b/docker/Dockerfile.full index e007691..b4516a7 100644 --- a/docker/Dockerfile.full +++ b/docker/Dockerfile.full @@ -72,3 +72,7 @@ RUN apt-get install --assume-yes --no-install-recommends --option=debug::pkgProb libasound-dev:arm64 \ liburing-dev:arm64 \ libz-dev:arm64 + +ENV POETRY_HOME="/tools/poetry" +ENV PATH="${POETRY_HOME}/bin:${PATH}" +RUN curl -sSL https://install.python-poetry.org | python3 - -- GitLab From 445c7c7241534d871ae541474ede322c013b6d4c Mon Sep 17 00:00:00 2001 From: Olivier Deprez Date: Wed, 26 Mar 2025 09:28:59 +0000 Subject: [PATCH 2/3] build: update TF-A v2.13/TF-RMM v0.7.0 firmware Update TF-A/TF-a-tests/Hafnium firmware components to v2.13 tag. Update TF-RMM firmware component to v0.7.0 tag. Signed-off-by: Olivier Deprez --- config/hafnium-base.yaml | 2 +- config/rmm-base.yaml | 2 +- config/tfa-base.yaml | 2 +- config/tftf-base.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/hafnium-base.yaml b/config/hafnium-base.yaml index 612b44f..93768be 100644 --- a/config/hafnium-base.yaml +++ b/config/hafnium-base.yaml @@ -12,7 +12,7 @@ build: hafnium: repo: remote: https://git.trustedfirmware.org/hafnium/hafnium.git - revision: v2.12.0 + revision: v2.13.0 params: PROJECT: reference diff --git a/config/rmm-base.yaml b/config/rmm-base.yaml index a839231..45504e9 100644 --- a/config/rmm-base.yaml +++ b/config/rmm-base.yaml @@ -7,7 +7,7 @@ build: rmm: repo: remote: https://git.trustedfirmware.org/TF-RMM/tf-rmm.git - revision: tf-rmm-v0.6.0 + revision: tf-rmm-v0.7.0 toolchain: aarch64-none-elf- diff --git a/config/tfa-base.yaml b/config/tfa-base.yaml index 1d141a4..4244d05 100644 --- a/config/tfa-base.yaml +++ b/config/tfa-base.yaml @@ -11,7 +11,7 @@ build: tfa: repo: remote: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git - revision: v2.12.0 + revision: v2.13.0 toolchain: aarch64-none-elf- diff --git a/config/tftf-base.yaml b/config/tftf-base.yaml index e313dbd..e429ca5 100644 --- a/config/tftf-base.yaml +++ b/config/tftf-base.yaml @@ -12,7 +12,7 @@ build: tftf: repo: remote: https://git.trustedfirmware.org/TF-A/tf-a-tests.git - revision: v2.12.0 + revision: v2.13.0 toolchain: aarch64-none-elf- -- GitLab From e5d5af1d17ed1346d92dcb6fc1d4cdd3a9e6bb46 Mon Sep 17 00:00:00 2001 From: Olivier Deprez Date: Mon, 26 May 2025 14:57:37 +0000 Subject: [PATCH 3/3] docker: update FVP to 11.29 Update AEM FVP to latest 11.29 package. Signed-off-by: Olivier Deprez --- docker/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/build.sh b/docker/build.sh index 8191faa..db9821c 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -108,8 +108,8 @@ if [ "${ARCH}" = "x86_64" ]; then TCH_PKG_URL_AARCH32=https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel TCH_PKG_NAME_AARCH32=arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz TCH_PATH_AARCH32=arm-gnu-toolchain-13.2.Rel1-x86_64-arm-none-eabi/bin - FVP_PKG_URL=https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/FM-11.28 - FVP_PKG_NAME=FVP_Base_RevC-2xAEMvA_11.28_23_Linux64.tgz + FVP_PKG_URL=https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/FM-11.29 + FVP_PKG_NAME=FVP_Base_RevC-2xAEMvA_11.29_27_Linux64.tgz FVP_MODEL_DIR=Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3 # ARCH is "aarch64" on Ubuntu, or "arm64" on Mac OS elif [ "${ARCH}" = "aarch64" ] || [ "${ARCH}" = "arm64" ]; then @@ -122,8 +122,8 @@ elif [ "${ARCH}" = "aarch64" ] || [ "${ARCH}" = "arm64" ]; then TCH_PKG_URL_AARCH32=https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel TCH_PKG_NAME_AARCH32=arm-gnu-toolchain-13.2.rel1-aarch64-arm-none-eabi.tar.xz TCH_PATH_AARCH32=arm-gnu-toolchain-13.2.Rel1-aarch64-arm-none-eabi/bin - FVP_PKG_URL=https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/FM-11.28 - FVP_PKG_NAME=FVP_Base_RevC-2xAEMvA_11.28_23_Linux64_armv8l.tgz + FVP_PKG_URL=https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/FM-11.29 + FVP_PKG_NAME=FVP_Base_RevC-2xAEMvA_11.29_27_Linux64_armv8l.tgz FVP_MODEL_DIR=Base_RevC_AEMvA_pkg/models/Linux64_armv8l_GCC-9.3 else echo "Host architecture ${ARCH} not supported" -- GitLab