diff --git a/config/hafnium-base.yaml b/config/hafnium-base.yaml index 612b44f180b2e3ae06f55faf893740762301688f..93768be937db905f160a2c1e53976ada0a201a93 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 a8392313492c26f8a19005c53f7f5ef0a7cfc943..45504e9638c0a8bd403be5e8493a4fc45378dee6 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 1d141a4af19b34ad7bc2c71c19c41d5f0721a4c7..4244d056aeb20d36c2a80288d5f08afb3e5a5557 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 e313dbd98d991939ae54cbcfcac4f5665f8e7359..e429ca53f470b17440c6e6c390daae24837ea220 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- diff --git a/docker/Dockerfile.full b/docker/Dockerfile.full index e007691f2d934dda1762cf50ab857ceaa15f0a11..b4516a7cede2dee512a61c32d95be91c99e94c8a 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 - diff --git a/docker/build.sh b/docker/build.sh index 8191faa85f725f47b18623734dccc93999085750..db9821cecefe3a0cea3e86312804f178b83d8e18 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"