From 4f8755fe0860fd6cf5ccf49b8b7569c6dc56291c Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 15 Jul 2025 18:15:37 -0600 Subject: [PATCH 1/3] CI: Disable sifive_unleashed_sdcard QEMU testing Changes in upstream QEMU have lead to this specific configuration of the sifive_unleashed platform not working in QEMU. Until this can be root caused and resolved, disable this test for now. Link: https://gitlab.com/qemu-project/qemu/-/issues/2945 Signed-off-by: Tom Rini --- .azure-pipelines.yml | 9 +++++---- .gitlab-ci.yml | 13 +++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index b3fd4ceef13..e98882ca865 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -531,10 +531,11 @@ stages: TEST_PY_BD: "r2dplus" TEST_PY_ID: "--id tulip_qemu" TEST_PY_TEST_SPEC: "not sleep" - sifive_unleashed_sdcard: - TEST_PY_BD: "sifive_unleashed" - TEST_PY_ID: "--id sdcard_qemu" - TEST_PY_TEST_SPEC: "not sleep" +# This is broken upsteam: https://gitlab.com/qemu-project/qemu/-/issues/2945 +# sifive_unleashed_sdcard: +# TEST_PY_BD: "sifive_unleashed" +# TEST_PY_ID: "--id sdcard_qemu" +# TEST_PY_TEST_SPEC: "not sleep" sifive_unleashed_spi-nor: TEST_PY_BD: "sifive_unleashed" TEST_PY_ID: "--id spi-nor_qemu" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2dfeda9985d..dd628fb1cfa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -519,12 +519,13 @@ r2dplus_tulip test.py: TEST_PY_ID: "--id tulip_qemu" <<: *buildman_and_testpy_dfn -sifive_unleashed_sdcard test.py: - variables: - TEST_PY_BD: "sifive_unleashed" - TEST_PY_TEST_SPEC: "not sleep" - TEST_PY_ID: "--id sdcard_qemu" - <<: *buildman_and_testpy_dfn +# This is broken upsteam: https://gitlab.com/qemu-project/qemu/-/issues/2945 +#sifive_unleashed_sdcard test.py: +# variables: +# TEST_PY_BD: "sifive_unleashed" +# TEST_PY_TEST_SPEC: "not sleep" +# TEST_PY_ID: "--id sdcard_qemu" +# <<: *buildman_and_testpy_dfn sifive_unleashed_spi-nor test.py: variables: From 910aa6c1ef2ed17ff6f738e9365664fa8b24a347 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 15 Jul 2025 18:15:38 -0600 Subject: [PATCH 2/3] Dockerfile: Update to QEMU 10.0.2 As QEMU 10.0.2 is the current release, update to that so that we can update other features within CI. Signed-off-by: Tom Rini --- tools/docker/Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index ceb7a25ad4d..02821417ca0 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -125,6 +125,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ python3-dev \ python3-pip \ python3-sphinx \ + python3-tomli \ python3-venv \ rpm2cpio \ sbsigntool \ @@ -218,13 +219,10 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \ cd /tmp/qemu && \ - git checkout v8.2.0 && \ + git checkout v10.0.2 && \ # config user.name and user.email to make 'git am' happy git config user.name u-boot && \ git config user.email u-boot@denx.de && \ - git format-patch 0c7ffc977195~..0c7ffc977195 && \ - git am 0001-hw-net-cadence_gem-Fix-MDIO_OP_xxx-values.patch && \ - git cherry-pick d3c79c3974 && \ ./configure --prefix=/opt/qemu --target-list="aarch64-softmmu,arm-softmmu,i386-softmmu,m68k-softmmu,mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu,ppc-softmmu,riscv32-softmmu,riscv64-softmmu,sh4-softmmu,x86_64-softmmu,xtensa-softmmu" && \ make -j$(nproc) all install && \ rm -rf /tmp/qemu From 0fabedfcde546a0d5bd17c89338d982903c2436c Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 15 Jul 2025 18:15:39 -0600 Subject: [PATCH 3/3] CI: Update to coreboot 25.03 At this point there's problems rebuilding coreboot-24.08 without manual intervention. Let us upgrade to a newer version. Signed-off-by: Tom Rini --- tools/docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 02821417ca0..a83c80db496 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -292,8 +292,8 @@ RUN mkdir /tmp/trace && \ rm -rf /tmp/trace # Build coreboot -RUN wget -O - https://coreboot.org/releases/coreboot-24.08.tar.xz | tar -C /tmp -xJ && \ - cd /tmp/coreboot-24.08 && \ +RUN wget -O - https://coreboot.org/releases/coreboot-25.03.tar.xz | tar -C /tmp -xJ && \ + cd /tmp/coreboot-25.03 && \ make crossgcc-i386 CPUS=$(nproc) && \ make -C payloads/coreinfo olddefconfig && \ make -C payloads/coreinfo && \ @@ -304,7 +304,7 @@ RUN wget -O - https://coreboot.org/releases/coreboot-24.08.tar.xz | tar -C /tmp make -j $(nproc) && \ sudo mkdir /opt/coreboot && \ sudo cp build/coreboot.rom build/cbfstool /opt/coreboot/ && \ - rm -rf /tmp/coreboot-24.08 + rm -rf /tmp/coreboot-25.03 # Create our user/group RUN echo uboot ALL=NOPASSWD: ALL > /etc/sudoers.d/uboot