[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/5] tests/avocado: update sbsa-ref firmware
From: |
Alex Bennée |
Subject: |
[PULL 2/5] tests/avocado: update sbsa-ref firmware |
Date: |
Wed, 20 Mar 2024 16:13:37 +0000 |
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
We now have CI job to build those and publish in space with
readable urls.
Firmware is built using Debian 'bookworm' cross toolchain (gcc 12.2.0).
Used versions:
- Trusted Firmware v2.10.2
- Tianocore EDK2 stable202402
- Tianocore EDK2 Platforms code commit 085c2fb
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20240318-sbsa-ref-firmware-update-v3-1-1c33b995a538@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/tests/avocado/machine_aarch64_sbsaref.py
b/tests/avocado/machine_aarch64_sbsaref.py
index 528c7d2934..cbab793455 100644
--- a/tests/avocado/machine_aarch64_sbsaref.py
+++ b/tests/avocado/machine_aarch64_sbsaref.py
@@ -1,6 +1,6 @@
# Functional test that boots a Linux kernel and checks the console
#
-# SPDX-FileCopyrightText: 2023 Linaro Ltd.
+# SPDX-FileCopyrightText: 2023-2024 Linaro Ltd.
# SPDX-FileContributor: Philippe Mathieu-Daudé <philmd@linaro.org>
# SPDX-FileContributor: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
#
@@ -32,34 +32,36 @@ def fetch_firmware(self):
"""
Flash volumes generated using:
- - Fedora GNU Toolchain version 13.2.1 20230728 (Red Hat 13.2.1-1)
+ Toolchain from Debian:
+ aarch64-linux-gnu-gcc (Debian 12.2.0-14) 12.2.0
- - Trusted Firmware-A
- https://github.com/ARM-software/arm-trusted-firmware/tree/7c3ff62d
+ Used components:
+
+ - Trusted Firmware 2.10.2
+ - Tianocore EDK2 stable202402
+ - Tianocore EDK2-platforms commit 085c2fb
- - Tianocore EDK II
- https://github.com/tianocore/edk2/tree/0f9283429dd4
- https://github.com/tianocore/edk2/tree/ad1c0394b177
- https://github.com/tianocore/edk2-platforms/tree/d03a60523a60
"""
# Secure BootRom (TF-A code)
fs0_xz_url = (
- "https://fileserver.linaro.org/s/rE43RJyTfxPtBkc/"
- "download/SBSA_FLASH0.fd.xz"
+ "https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/"
+ "20240313-116475/edk2/SBSA_FLASH0.fd.xz"
)
- fs0_xz_hash = "cdb8e4ffdaaa79292b7b465693f9e5fae6b7062d"
- tar_xz_path = self.fetch_asset(fs0_xz_url, asset_hash=fs0_xz_hash)
+ fs0_xz_hash =
"637593749cc307dea7dc13265c32e5d020267552f22b18a31850b8429fc5e159"
+ tar_xz_path = self.fetch_asset(fs0_xz_url, asset_hash=fs0_xz_hash,
+ algorithm='sha256')
archive.extract(tar_xz_path, self.workdir)
fs0_path = os.path.join(self.workdir, "SBSA_FLASH0.fd")
# Non-secure rom (UEFI and EFI variables)
fs1_xz_url = (
- "https://fileserver.linaro.org/s/AGWPDXbcqJTKS4R/"
- "download/SBSA_FLASH1.fd.xz"
+ "https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/"
+ "20240313-116475/edk2/SBSA_FLASH1.fd.xz"
)
- fs1_xz_hash = "411155ae6984334714dff08d5d628178e790c875"
- tar_xz_path = self.fetch_asset(fs1_xz_url, asset_hash=fs1_xz_hash)
+ fs1_xz_hash =
"cb0a5e8cf5e303c5d3dc106cfd5943ffe9714b86afddee7164c69ee1dd41991c"
+ tar_xz_path = self.fetch_asset(fs1_xz_url, asset_hash=fs1_xz_hash,
+ algorithm='sha256')
archive.extract(tar_xz_path, self.workdir)
fs1_path = os.path.join(self.workdir, "SBSA_FLASH1.fd")
@@ -96,15 +98,15 @@ def test_sbsaref_edk2_firmware(self):
# AP Trusted ROM
wait_for_console_pattern(self, "Booting Trusted Firmware")
- wait_for_console_pattern(self, "BL1: v2.9(release):v2.9")
+ wait_for_console_pattern(self, "BL1: v2.10.2(release):")
wait_for_console_pattern(self, "BL1: Booting BL2")
# Trusted Boot Firmware
- wait_for_console_pattern(self, "BL2: v2.9(release)")
+ wait_for_console_pattern(self, "BL2: v2.10.2(release)")
wait_for_console_pattern(self, "Booting BL31")
# EL3 Runtime Software
- wait_for_console_pattern(self, "BL31: v2.9(release)")
+ wait_for_console_pattern(self, "BL31: v2.10.2(release)")
# Non-trusted Firmware
wait_for_console_pattern(self, "UEFI firmware (version 1.0")
--
2.39.2
- [PULL 0/5] more maintainer updates (git, avocado), Alex Bennée, 2024/03/20
- [PULL 3/5] tests/avocado: drop virtio-rng from sbsa-ref tests, Alex Bennée, 2024/03/20
- [PULL 1/5] gitlab: aggressively avoid extra GIT data, Alex Bennée, 2024/03/20
- [PULL 4/5] tests/avocado: sbsa-ref: add Alpine tests for misc 'max' setup, Alex Bennée, 2024/03/20
- [PULL 2/5] tests/avocado: update sbsa-ref firmware,
Alex Bennée <=
- [PULL 5/5] tests/avocado: sbsa-ref: add OpenBSD tests for misc 'max' setup, Alex Bennée, 2024/03/20
- Re: [PULL 0/5] more maintainer updates (git, avocado), Peter Maydell, 2024/03/21