From 82b9ccc5fab84bc57ce225c2a585fd2b38539055 Mon Sep 17 00:00:00 2001 From: Olivier Deprez Date: Wed, 26 Mar 2025 11:30:07 +0000 Subject: [PATCH 1/2] config: move image field to hafnium-base Follow up to: a502ce3 feature: add an optional 'image' field to config files. 0ca0537 config: ffa-hafnium-optee: Use the optional 'image' field Move the "image:" field to hafnium-base config and remove it from cca-4world and ffa-hafnium-optee configs. This will benefit configurations consuming hafnium-base config including above ones and ffa-tftf, or future configuration consuming this config. Signed-off-by: Olivier Deprez --- config/cca-4world.yaml | 2 -- config/ffa-hafnium-optee.yaml | 2 -- config/hafnium-base.yaml | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/config/cca-4world.yaml b/config/cca-4world.yaml index 82851d8..185fa68 100644 --- a/config/cca-4world.yaml +++ b/config/cca-4world.yaml @@ -31,8 +31,6 @@ description: >- See cca-3worlds.yaml config :ref:`userguide/configstore/cca-3world:description` if willing to launch a realm using kvmtool. -image: shrinkwraptool/base-full - concrete: true layers: diff --git a/config/ffa-hafnium-optee.yaml b/config/ffa-hafnium-optee.yaml index af0ac85..33b9db1 100644 --- a/config/ffa-hafnium-optee.yaml +++ b/config/ffa-hafnium-optee.yaml @@ -10,8 +10,6 @@ description: >- (Secure Partition Manager Core) and OPTEE as a secure partition/VM in secure EL1 and Linux in Normal world. -image: shrinkwraptool/base-full - concrete: true layers: diff --git a/config/hafnium-base.yaml b/config/hafnium-base.yaml index fca2c2e..612b44f 100644 --- a/config/hafnium-base.yaml +++ b/config/hafnium-base.yaml @@ -6,6 +6,8 @@ description: >- Hafnium is the Secure Partition Manager that runs at SEL2. +image: shrinkwraptool/base-full + build: hafnium: repo: -- GitLab From 283586901bbcf61eb5a9859248715e365824f9be Mon Sep 17 00:00:00 2001 From: Olivier Deprez Date: Wed, 26 Mar 2025 14:25:11 +0000 Subject: [PATCH 2/2] docker: update FVP to 11.28 Update FVP to latest public FM 11.28 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 48f5fd7..8191faa 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/Fixed-Virtual-Platforms/FM-11.27 - FVP_PKG_NAME=FVP_Base_RevC-2xAEMvA_11.27_19_Linux64.tgz + 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_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/Fixed-Virtual-Platforms/FM-11.27 - FVP_PKG_NAME=FVP_Base_RevC-2xAEMvA_11.27_19_Linux64_armv8l.tgz + 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_MODEL_DIR=Base_RevC_AEMvA_pkg/models/Linux64_armv8l_GCC-9.3 else echo "Host architecture ${ARCH} not supported" -- GitLab