From 074bfab54d83ab1da3e872d363570bba9e134f62 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 11 Mar 2024 10:02:43 -0400 Subject: CI: Cherry-pick reset support for m68k for QEMU In order to support the reset pytest on QEMU on m68k platforms we need to grab this change from upstream. Signed-off-by: Tom Rini --- tools/docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) (limited to 'tools/docker') diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index f5968e165c..6d9931be7a 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -185,6 +185,7 @@ RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \ 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 -- cgit v1.2.3