From 25296cf3c0e5a52cd346784d2db8af646cedcd82 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 28 Feb 2024 08:43:11 +0100 Subject: Dockerfile: build fiptool Fiptool is used in a binman test. The test is skipped without the binary. Signed-off-by: Heinrich Schuchardt --- tools/docker/Dockerfile | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'tools/docker') diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 27425545661..30cda72ec46 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -188,6 +188,16 @@ RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \ make -j$(nproc) all install && \ rm -rf /tmp/qemu +# Build fiptool +RUN git clone https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git /tmp/tf-a && \ + cd /tmp/tf-a/ && \ + git checkout v2.10.0 && \ + cd tools/fiptool && \ + make && \ + mkdir -p /usr/local/bin && \ + cp fiptool /usr/local/bin && \ + rm -rf /tmp/tf-a + # Build genimage (required by some targets to generate disk images) RUN wget -O - https://github.com/pengutronix/genimage/releases/download/v14/genimage-14.tar.xz | tar -C /tmp -xJ && \ cd /tmp/genimage-14 && \ -- cgit v1.2.3 From d3f9078bed900f9b359af6a09b2d90d9f9d5d3eb Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 28 Feb 2024 08:23:09 +0100 Subject: Dockerfile: install xilinx-bootgen package Bootgen is used in a binman test. The test is skipped without the binary. Signed-off-by: Heinrich Schuchardt --- tools/docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) (limited to 'tools/docker') diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 30cda72ec46..dae6c24c684 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -116,6 +116,7 @@ RUN apt-get update && apt-get install -y \ virtualenv \ vboot-kernel-utils \ vboot-utils \ + xilinx-bootgen \ xxd \ zip \ && rm -rf /var/lib/apt/lists/* -- cgit v1.2.3 From 96afd8a3bb6761fa15ae9969253a9a2d04966bab Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 10 Mar 2024 15:59:28 -0400 Subject: CI: Update to using clang-17 Currently, llvm-17 is the stable release. Update our container and CI to fetch and use that. Signed-off-by: Tom Rini --- tools/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/docker') diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index dae6c24c684..f5968e165c5 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -12,7 +12,7 @@ ENV DEBIAN_FRONTEND=noninteractive # Add LLVM repository RUN apt-get update && apt-get install -y gnupg2 wget xz-utils && rm -rf /var/lib/apt/lists/* RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - -RUN echo deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main | tee /etc/apt/sources.list.d/llvm.list +RUN echo deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main | tee /etc/apt/sources.list.d/llvm.list # Manually install the kernel.org "Crosstool" based toolchains for gcc-13.2.0 RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.2.0/x86_64-gcc-13.2.0-nolibc-aarch64-linux.tar.xz | tar -C /opt -xJ @@ -40,7 +40,7 @@ RUN apt-get update && apt-get install -y \ bison \ build-essential \ cgpt \ - clang-16 \ + clang-17 \ coreutils \ cpio \ curl \ -- cgit v1.2.3 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 f5968e165c5..6d9931be7a8 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 From cacc0b2678c03d694e8be70f8e7b7601825f1c0f Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 14 Mar 2024 22:36:43 -0400 Subject: CI: Move to latest container image This moves us to our latest container image, which is now based on the current "Jammy" tag. Signed-off-by: Tom Rini --- tools/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/docker') diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 6d9931be7a8..cda87354566 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -2,7 +2,7 @@ # This Dockerfile is used to build an image containing basic stuff to be used # to build U-Boot and run our test suites. -FROM ubuntu:jammy-20240125 +FROM ubuntu:jammy-20240227 MAINTAINER Tom Rini LABEL Description=" This image is for building U-Boot inside a container" -- cgit v1.2.3