From patchwork Thu Feb 19 19:21:22 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1898 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528913; bh=rQabP6i5O3JXShRGepFAbB1ywbsqZOhToQ02BVlNBrE=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=dEiE53YSorJr9oOJyd/h35jAk2v6SVaTEKtPBI3M7kDGKruOPHIvH3QObMr3fNL53 tzT/NUFsd5/avAoTtE541tDd/I2wkcwiNND9jlSf1j5c/a6slPCgz4HPtFIeXy/eob OkeKeQfzluv9qlKniSDxecXXSf0NPQBNVDdnYMtiqgENFhuvD19iNHGFnGaGytxufK VrkCtHsRCO/d5vl5gaX58ngVIm863CCrn1whGIXUZzMUt6kikqu1GZXIStNIlrqXOp vaY9gVFACZ5lTrK854LlG85mvgn8tTnVv7WxW0ZB3Yxsp3V1J5qyrHh/C569jkF+TC lxhEFPavgUasA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id B3A5169C79 for ; Thu, 19 Feb 2026 12:21:53 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id liwSRg27By17 for ; Thu, 19 Feb 2026 12:21:53 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528913; bh=rQabP6i5O3JXShRGepFAbB1ywbsqZOhToQ02BVlNBrE=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=dEiE53YSorJr9oOJyd/h35jAk2v6SVaTEKtPBI3M7kDGKruOPHIvH3QObMr3fNL53 tzT/NUFsd5/avAoTtE541tDd/I2wkcwiNND9jlSf1j5c/a6slPCgz4HPtFIeXy/eob OkeKeQfzluv9qlKniSDxecXXSf0NPQBNVDdnYMtiqgENFhuvD19iNHGFnGaGytxufK VrkCtHsRCO/d5vl5gaX58ngVIm863CCrn1whGIXUZzMUt6kikqu1GZXIStNIlrqXOp vaY9gVFACZ5lTrK854LlG85mvgn8tTnVv7WxW0ZB3Yxsp3V1J5qyrHh/C569jkF+TC lxhEFPavgUasA== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 9FFCB69C75 for ; Thu, 19 Feb 2026 12:21:53 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528911; bh=hYhTc+JqeRU5re54YBrFMnp9fNsHg6ut+CssbHSxl10=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wCvnqXvp5AyOedqbfhMWfaIzjPkqkqm5qZtpAQ13f9Fz8JXKk8hdQxC9ebqJQf5gf lm5gdHpjwjvIh19n91s7ffFGyeIIph32L8oVSFN2R7menmvYX7BCVfNhkZJJkwr4Y1 vSm/PgO+0CVLTSCwMBdpxAbiKJUTI4mzHB34mbO4o2/ij2C7TPKbXzxZoCgCtfAoEP f0Z/gpg3W+3YuVmy+cOOFab64bwrZaIsNXMqA18dNvWbpxeZj3xU1BEfqNytD/g48T R4IuhA/z7neYuwIdJRkJfV6JfaU48KmjqnZva18tT0Unp/1ecKB+z0s8Mlt/yRg0p3 3AdtLvSvY5nvg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id B6C4E69C73; Thu, 19 Feb 2026 12:21:51 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id fsFDu_mHk8e1; Thu, 19 Feb 2026 12:21:51 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528907; bh=+sfWgmhlX0s4/2zTIlh5S98BLdaaZDnZQVxecD6PUt8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hlolMaZXbBquvj/6BfIETXMl0IfmzX8UHADyWYvPG/O/ZfQzZklzrF8viBknziBZ5 jwrFTWdlk2wEdsag+lzD+oQibSp+dIQqKPZID+E9MqxXyTW2VYdJ34cEanf+v0MUIV v8oImfuAEiAqDddqdWMPukN0P8r3IY7sxGq60gsfkwbvyJgh9+KlPX8nL0X0DMLycY WhAdzHTaHXllSmISrD7SCbw1FvsxHOLN2T0jSPs0IulF9c2aLrJxJvKxV/oX+8WzAE 0oRfFQyN4B7F30bhSmkpgytlyJ8uu3VmK5L+q3+PqgMTNYdoQaVdGeeKCo0609Yv4O xia+fz59gxrKQ== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 31D3A69C01; Thu, 19 Feb 2026 12:21:47 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Thu, 19 Feb 2026 12:21:22 -0700 Message-ID: <20260219192130.737116-2-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260219192130.737116-1-sjg@u-boot.org> References: <20260219192130.737116-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: SGH3LDASS22QBUAYQOZYYMJIU6AOMYEL X-Message-ID-Hash: SGH3LDASS22QBUAYQOZYYMJIU6AOMYEL X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Tom Rini , Simon Glass X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 1/5] Dockerfile: Download the Arm FVP and extract it List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Tom Rini There are some reference platforms from Arm which are not found in QEMU but instead in the FVP tool. As we can make use of this in CI later on, download and extract it in our Dockerfile today. Signed-off-by: Tom Rini (cherry picked from commit 01fa1b18ae68381d9d462be66df3943f41426874) Signed-off-by: Simon Glass --- tools/docker/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index a30b670b300..0f0c290c232 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -241,6 +241,9 @@ RUN git clone https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git /tmp/t cp fiptool /usr/local/bin && \ rm -rf /tmp/tf-a +# Download the Arm Architecture FVP platform. This file is double compressed. +RUN wget -O - https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/FM-11.28/FVP_Base_RevC-2xAEMvA_11.28_23_Linux64.tgz | gunzip -dc | tar -C /opt -x + # 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 && \ From patchwork Thu Feb 19 19:21:23 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1899 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528917; bh=byFjt7hnlFfM4CREaFUYQj1gpDpmBDt7sB8KLh//LbM=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=D/tGoM9CncSLQ5QwRslzQWmxtLiqZAH10DZgc+eaX/dk1gtTmA88czOm+txPhMBXV ImTzeNWcM6rRsR1f/wAIhqtoaVTnVoOuDJQu4pE/7XgUo7qzkZZ4peJO23gCsNlwaK RsCXOiEBQDjsqcSFz33WzF+Z/N9XAajZ/OUt6dV6nZienYxIUWwmPvzKxeUmXkXU4m lMyBya4NlN2kLEuXn84EXQguXf/Yr5WPpmw/kc0crrDiQWf0Yl22Crh8iLcQkhKKXi EdBWPe7PwXE2am5qdjs9wrx+raBl47PPIjsJMYNq8wjc0Jd3Sb3o4caskWE5ESjrO1 x9tHUz3GeADWw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id CBB0269C7C for ; Thu, 19 Feb 2026 12:21:57 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id d94lazmb1t6S for ; Thu, 19 Feb 2026 12:21:57 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528917; bh=byFjt7hnlFfM4CREaFUYQj1gpDpmBDt7sB8KLh//LbM=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=D/tGoM9CncSLQ5QwRslzQWmxtLiqZAH10DZgc+eaX/dk1gtTmA88czOm+txPhMBXV ImTzeNWcM6rRsR1f/wAIhqtoaVTnVoOuDJQu4pE/7XgUo7qzkZZ4peJO23gCsNlwaK RsCXOiEBQDjsqcSFz33WzF+Z/N9XAajZ/OUt6dV6nZienYxIUWwmPvzKxeUmXkXU4m lMyBya4NlN2kLEuXn84EXQguXf/Yr5WPpmw/kc0crrDiQWf0Yl22Crh8iLcQkhKKXi EdBWPe7PwXE2am5qdjs9wrx+raBl47PPIjsJMYNq8wjc0Jd3Sb3o4caskWE5ESjrO1 x9tHUz3GeADWw== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id B730069C77 for ; Thu, 19 Feb 2026 12:21:57 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528916; bh=3KYGdDzDrF6BjFmUZUR76LH2KtfuT1SR46QYx8s7t4k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V0PhoPMsR0z6jWLDUqHe3Fya0V9LGD6vlEJVlW4rmEy7hdiRfh7qsNSK0cElI8Dfw cXDNo9oZaBu//wTd0AXkGfHQX5gZMXshbTmI29McZNQi0BVgPTA39jOjwuJi99IEEm pWG1uzK3KMJgnqJjES0+xUvd0i9DgLjsCDtLosWPxHyFZpfi0qIP6zj36Ucjh6L2XY 28azNA8ZqamUbyb+Xc80TIBecHNhh9tpCMqij3PTCAJcK7NA/JVUtds7yDtCWc/l39 dVY8Sy2obWAjiN80t8yvB3k7A8S4IVlG+96IzDzUahDeQs1GiHasD9zQv+AyBnl/k5 z3MPVTmx6WBqw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 99FD769C73; Thu, 19 Feb 2026 12:21:56 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id ktd5Li49m4VA; Thu, 19 Feb 2026 12:21:56 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528912; bh=DtkPwpJN5ouS/Cpywe1Vr6urzFtDikp0gE16koP9PAQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iBSLcuMpMPFWdd2ypPXj8GkAU4zXrDLsr6SMb0Hlk272+i8qkQuURmk2pvncrZdvn J7HtpolZrOQDbdLE+9mxmglgPpadBDZIueH7/a9tPHhYwrq1nqrXx2NAGNR8xaguyb F+122AfitpI8EAV6+JvFNFVLRHdbTcrqdGT53Uxk+DYLa+eZbE+ztx5aFNwyOiVk77 VZf9T0Gljrwr6k6zCmkhkKG8SAfJ7nGOTHQpGNlMDdsqwbpsjJgI+BXuU3B4LAuAI1 u9/PqsPIgnROkjXp4+G3NObqrIKhZVVIABrfFmLHuDIc/NErcNXHsmTvfJ/aWkfnI1 cy03w6IU0b4pQ== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 070D469C01; Thu, 19 Feb 2026 12:21:51 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Thu, 19 Feb 2026 12:21:23 -0700 Message-ID: <20260219192130.737116-3-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260219192130.737116-1-sjg@u-boot.org> References: <20260219192130.737116-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: 54DTI4PJEUQHDQPKDTNSJB2ASBDVKHVA X-Message-ID-Hash: 54DTI4PJEUQHDQPKDTNSJB2ASBDVKHVA X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Tom Rini , Harrison Mutai , Ilias Apalodimas , Simon Glass X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 2/5] Docker, CI: Add vexpress_fvp / vexpress_fvp_bloblist support List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Tom Rini This adds the vexpress_fvp and vexpress_fvp_bloblist platforms to the list of platforms we test via emulator in CI. In order to do this we need to first have our container runtime have TF-A builds for the vexpress_fvp platform, both with and without transfer list support as well as installing "telnet" so that we can access console. In the CI files we check for the existence of /opt/tf-a/${TEST_PY_BD} and if found, copy bl1.bin and fip.bin to /tmp and set the variables so that we can later run FVP to run. Note that we currently disable the hostfs (semihosting) tests as they trigger a bug in FVP. This has been reported upstream, and can be enabled when fixed. Reviewed-by: Harrison Mutai Acked-by: Ilias Apalodimas Signed-off-by: Tom Rini (cherry picked from commit d75998b476de439a05b2f7ec95d426410bcaae18) Signed-off-by: Simon Glass --- tools/docker/Dockerfile | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 0f0c290c232..b804df03e16 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -87,6 +87,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ help2man \ iasl \ imagemagick \ + inetutils-telnet \ iputils-ping \ libconfuse-dev \ libgit2-dev \ @@ -234,11 +235,19 @@ RUN git clone https://gitlab.com/qemu-project/qemu.git /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 -j$(nproc) && \ - mkdir -p /usr/local/bin && \ - cp fiptool /usr/local/bin && \ + git checkout v2.12.0 && \ + make CROSS_COMPILE=/opt/gcc-${TCVER}-nolibc/aarch64-linux/bin/aarch64-linux- \ + PLAT=fvp BL33=/dev/null -j$(nproc) all fip && \ + mkdir -p /usr/local/bin /opt/tf-a/vexpress_fvp && \ + cp tools/fiptool/fiptool /usr/local/bin && \ + cp build/fvp/release/fip.bin build/fvp/release/bl1.bin \ + /opt/tf-a/vexpress_fvp/ && \ + rm -rf build/fvp && \ + make CROSS_COMPILE=/opt/gcc-${TCVER}-nolibc/aarch64-linux/bin/aarch64-linux- \ + PLAT=fvp BL33=/dev/null TRANSFER_LIST=1 -j$(nproc) all fip && \ + mkdir -p /opt/tf-a/vexpress_fvp_bloblist && \ + cp build/fvp/release/fip.bin build/fvp/release/bl1.bin \ + /opt/tf-a/vexpress_fvp_bloblist/ && \ rm -rf /tmp/tf-a # Download the Arm Architecture FVP platform. This file is double compressed. From patchwork Thu Feb 19 19:21:24 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1900 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528923; bh=xuSMVsT3nIyiUF8J+vycgdjDj9hB/+QfLvpPaljbocg=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=W0fOF64kVJ9Ym5qpG4KLH3g4L1Y5pzMg1SoTu/I2S5Zhc1sveBbycwhmEoQ9s7OSe qY1YBicMi/UEIle4zSYwDkwyZFt0+tapBvYFpAGAKavKIkCASEpYaexvhZqv7oizRh YVYJ4vqcqM+MRvnRp1VVh1jGHhJSi88RmVUBy6/UZoVL+LKYzAT6QwVnrwTI/TC5fB KZixtzCkLaM6oSDtnnsyCuqMjLHMO3l0XEldNXNbd7Z6uGNXPPPiNJzKrJmZH/Yww0 vkMSw8kksve+7agR1P902CejWQZG03wpEyCo93zS8EeyL068sIu6y/jrVnD8BI0sJW 5v4tQ9xuv2jRg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 94F4369C74 for ; Thu, 19 Feb 2026 12:22:03 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 3Yix9KFdKyO4 for ; Thu, 19 Feb 2026 12:22:03 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528923; bh=xuSMVsT3nIyiUF8J+vycgdjDj9hB/+QfLvpPaljbocg=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=W0fOF64kVJ9Ym5qpG4KLH3g4L1Y5pzMg1SoTu/I2S5Zhc1sveBbycwhmEoQ9s7OSe qY1YBicMi/UEIle4zSYwDkwyZFt0+tapBvYFpAGAKavKIkCASEpYaexvhZqv7oizRh YVYJ4vqcqM+MRvnRp1VVh1jGHhJSi88RmVUBy6/UZoVL+LKYzAT6QwVnrwTI/TC5fB KZixtzCkLaM6oSDtnnsyCuqMjLHMO3l0XEldNXNbd7Z6uGNXPPPiNJzKrJmZH/Yww0 vkMSw8kksve+7agR1P902CejWQZG03wpEyCo93zS8EeyL068sIu6y/jrVnD8BI0sJW 5v4tQ9xuv2jRg== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 7B6A569C73 for ; Thu, 19 Feb 2026 12:22:03 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528921; bh=5RF4g3CEWA+uUlci73izeeLyv0TatmGmw4TaAGrllRs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WBTxuowafbzv7ehaR2TTeee691FdmLXPQSO2jIAFJdB3Hgh9fpoeLbHarTl0MEs4d mXy1t+Px1IeGmV3iCXAtVDshOtLeMvkKEnHnwKcpW5Z/zGns71PCjoTZvJf/0P5Om1 94mxTwkeU3x+z65HM3IwKrKcNZv2EcCUA/ZDMtutIskhIqt+Iec/bdJK9qzwRtwy0U eMw2iaiP08fXMIcPbuve568jQ7cl/cWgp4/9vLW8D70Zz6T/DTlAx2IX85wXEPixpi m11AQXx36CMOozv8ABDHHAHtRHJdY8uaLwtkWop5LqFz1nsacDoW7WcXNqTveUmV5p L2oz6KhFHa2eQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 604C269C73; Thu, 19 Feb 2026 12:22:01 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id o_pbkcGbYn8j; Thu, 19 Feb 2026 12:22:01 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528917; bh=DPdQPby3hzMiIfB2bvGlFMWbOdyh8zh7eEcIJA+K/iI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WKE6/ZIbQbNDWdQ5i2YJeHYGoFLuK6/JLSyVNoavTRUSarJeQMiuhuKXY3EsRGLw0 GgyWchz4c4jtMhYPEd5CTC5wEDqzKpm+7+jY9pgZAty5sSo+N2u4S+Oss9uYvRriQa 6L+MuaNrsm1avjmZ53H/owHk9kLZ5DOfm1PD8jTUbOmkBONRqoiIHEkZ3x3e0OoJsv I5CVL6lGppMgXf+JnMhX/dhcOX/u7mu/1qIVzowtxtRCoSu7A8nU/YRi5j8F3Oq4yZ OjTghuBPJMCqPRAm9gtu6iZf1vmTbQWLcJnVdRtM2nXDI0Wa1STYcwzEZleSmDZxmv lX9EcZPJaWJ2w== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id DA1C269C01; Thu, 19 Feb 2026 12:21:56 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Thu, 19 Feb 2026 12:21:24 -0700 Message-ID: <20260219192130.737116-4-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260219192130.737116-1-sjg@u-boot.org> References: <20260219192130.737116-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: 3UX2ITFMCI4FGPOBEQHXZLGMB6ZWJYGN X-Message-ID-Hash: 3UX2ITFMCI4FGPOBEQHXZLGMB6ZWJYGN X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Simon Glass , "Claude Opus 4 . 6" X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 3/5] docker: Install Rust toolchain for ulib examples List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass The ulib Rust demo requires cross-compilation targets that are not present in the CI Docker image. Install rustup with the minimal profile and add the four targets needed by the Rust demo builds: - i686-unknown-linux-gnu (qemu-x86) - x86_64-unknown-none (qemu-x86_64, efi-x86_app64) - riscv64gc-unknown-none-elf (qemu-riscv64, efi-riscv_app64) - aarch64-unknown-none (efi-arm_app64) Co-developed-by: Claude Opus 4.6 Signed-off-by: Simon Glass --- tools/docker/Dockerfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index b804df03e16..71932e5433c 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -315,6 +315,16 @@ RUN echo uboot ALL=NOPASSWD: ALL > /etc/sudoers.d/uboot RUN useradd -m -U uboot USER uboot:uboot +# Install Rust toolchain with cross-compilation targets for ulib examples +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \ + sh -s -- -y --default-toolchain stable --profile minimal && \ + . $HOME/.cargo/env && \ + rustup target add \ + aarch64-unknown-none \ + i686-unknown-linux-gnu \ + riscv64gc-unknown-none-elf \ + x86_64-unknown-none +ENV PATH="/home/uboot/.cargo/bin:${PATH}" # Populate the cache for pip to use. Get these via wget as the # COPY / ADD directives don't work as we need them to. From patchwork Thu Feb 19 19:21:25 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1901 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528928; bh=QG5rNJzuw4dxrbgWGkEe3N4wfW8VXH1irg+7BuW4pyg=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=o/TzM0KM6Y1CP+D/NOQXZB2VqcPKc/wHrdiqk4YVkPH0gGJ4+cAvDqPlbY+k/jDma VXulOXSwyLYGd8cZ12WoBz07TCar56InecPTq/OFehkvBfFsZEFB5MKb/hMGGVj21m RQASRSvnyzDF4t4kGcAbqgPEtxyWCgfQgpqyGqVE08QVyW1y9+6rmtklvIkvDIIxUP Ym0WI8zW9JWKpghRWAXOj7dbuFwmL5qYkm/vhenl7e376FCH2Ya4BlCf2GLNQFPOmV hcdFOJjlh/SGBrz9M3Fu3DQfS8MFrP91la9tg1G6pUQc47jdd746vr6HZGVyJR5RS/ /bsEEb1NDvBBw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 576F969C01 for ; Thu, 19 Feb 2026 12:22:08 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id ti7UcjtPjuyz for ; Thu, 19 Feb 2026 12:22:08 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528928; bh=QG5rNJzuw4dxrbgWGkEe3N4wfW8VXH1irg+7BuW4pyg=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=o/TzM0KM6Y1CP+D/NOQXZB2VqcPKc/wHrdiqk4YVkPH0gGJ4+cAvDqPlbY+k/jDma VXulOXSwyLYGd8cZ12WoBz07TCar56InecPTq/OFehkvBfFsZEFB5MKb/hMGGVj21m RQASRSvnyzDF4t4kGcAbqgPEtxyWCgfQgpqyGqVE08QVyW1y9+6rmtklvIkvDIIxUP Ym0WI8zW9JWKpghRWAXOj7dbuFwmL5qYkm/vhenl7e376FCH2Ya4BlCf2GLNQFPOmV hcdFOJjlh/SGBrz9M3Fu3DQfS8MFrP91la9tg1G6pUQc47jdd746vr6HZGVyJR5RS/ /bsEEb1NDvBBw== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 3780669C73 for ; Thu, 19 Feb 2026 12:22:08 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528926; bh=YRuE6qYdLwYSmM2ujBHKodxpDIprmJNWZCYHYvkkkME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O9zbsxTPgu7GpUiRfE2q8WcRN4cX7gQgbuLZoKdaCksazIjpjgy08S2KG7YDxAUbG jXgKKd+p/CR9FMh+cF/L0gd1IIE/t9Mk5UdivROOBcYA7YkT0DTqSlFM7IsYiK+SXy T0KWTBb8sZzx2BSMeEzDPd8Cp8397iGlfedFHUSIrNorzzqFTNxDYRiqfT7ewYXgbx a25//iqaahKBAg1vLldZAE6hVWowwXGJVosvPtUDY5ZUT/oZoXryAiDQwZIydRnsAh Q+C8bET+QpnW3e5qmLPiR1cB22fI9FtpY3RYOwHclbN2W6iDyfIo3r55j/bR/TGBp7 Nw5p6P7v3au+Q== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 36F3569C73; Thu, 19 Feb 2026 12:22:06 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id ESTVelgndR1l; Thu, 19 Feb 2026 12:22:06 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528921; bh=MorRJJ5IRCNCr2DaOeXpv5sCAFJBQ4BizsxsyTQzt1E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jJbbe8vwRkf3LoFPql6Pg7S/SZUHe6ViKUYhjLbQWu81YWY/RtFmlmtbQdte92r/n g0TpVrQS/6i9nCeGy73iJgXwMtgFTFLfcZSKNmnxZdM6tJZVoPYyodeQcwHR/2dnxk slQzhGM5zOVCyDO0FNw3nkrLC32QYAN/jAXLOObhyNhzkBFzupBbl2lfRF8yIUIItx puZ30qJ7WneSNU/bj9Knl0WKHKe5XC9A1sf4JNKBSHeDFOha8Ln6VZiXJu0SSoIbej s5edG0IWCUa43j1K1QOnLXH2NyN0xWB5pRlYKJLYanw9zpjj0Vk5K9xDs68okUEYoC 1culzKPjKtPTg== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 9FA9C69C01; Thu, 19 Feb 2026 12:22:01 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Thu, 19 Feb 2026 12:21:25 -0700 Message-ID: <20260219192130.737116-5-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260219192130.737116-1-sjg@u-boot.org> References: <20260219192130.737116-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: SU5BCEZITJCX46WEEN4YDKNB2DHHU7RP X-Message-ID-Hash: SU5BCEZITJCX46WEEN4YDKNB2DHHU7RP X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Simon Glass , "Claude Opus 4 . 6" X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 4/5] docker: Update Dockerfile for build compatibility List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass Pin trace-cmd dependencies to avoid libtraceevent 1.9+ which requires BTF kernel headers newer than Jammy's 5.15: - libtraceevent: b3f5849 (pre-BTF) - libtracefs: 1.8.1 - trace-cmd: 364faec Install libtraceevent/libtracefs with prefix=/usr and ldconfig for cross-platform library path compatibility (arm64 vs amd64). Update coreboot from 24.08 to 24.12 since Intel took down the ACPICA download used by 24.08. Make a few other changes to bring us in line with upstream commit d75998b476de ("Docker, CI: Add vexpress_fvp / vexpress_fvp_bloblist support") Update .gitlab-ci.yml to use the new image tag. Co-developed-by: Claude Opus 4.6 Signed-off-by: Simon Glass --- .gitlab-ci.yml | 2 +- tools/docker/Dockerfile | 24 ++++++++++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b6ca99a8ba..648c3f52c44 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ default: - ${DEFAULT_TAG} # Grab our configured image. The source for this is found # in the u-boot tree at tools/docker/Dockerfile - image: ${MIRROR_DOCKER}/sjg20/u-boot-gitlab-ci-runner:jammy-20250404-24Oct2025p1 + image: ${MIRROR_DOCKER}/sjg20/u-boot-gitlab-ci-runner:jammy-20250404-19feb26 services: - name: container-$(CI_JOB_ID) command: ["--rm"] diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 71932e5433c..90ad3708101 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -64,6 +64,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ binutils-dev \ bison \ build-essential \ + byacc \ cgpt \ clang-18 \ coreutils \ @@ -74,8 +75,10 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ e2fsprogs \ efitools \ erofs-utils \ + exfatprogs \ expect \ fakeroot \ + fdisk \ flex \ gawk \ gdisk \ @@ -281,24 +284,30 @@ RUN git clone https://github.com/stefanberger/swtpm /tmp/swtpm && \ rm -rf /tmp/swtpm # Build trace-cmd +# Pin to commits from Oct 2025 to avoid libtraceevent 1.9+ BTF dependency +# which requires kernel headers newer than Jammy's 5.15 RUN mkdir /tmp/trace && \ git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git /tmp/trace/libtraceevent && \ cd /tmp/trace/libtraceevent && \ + git checkout b3f5849 && \ make -j$(nproc) && \ - sudo make install && \ - git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git /tmp/trace/libtracefs && \ + sudo make install prefix=/usr && \ + sudo ldconfig && \ + git clone --branch libtracefs-1.8.1 --depth 1 https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git /tmp/trace/libtracefs && \ cd /tmp/trace/libtracefs && \ make -j$(nproc) && \ - sudo make install && \ + sudo make install prefix=/usr && \ + sudo ldconfig && \ git clone https://github.com/rostedt/trace-cmd.git /tmp/trace/trace-cmd && \ cd /tmp/trace/trace-cmd && \ + git checkout 364faec && \ make -j$(nproc) && \ sudo make install && \ 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-24.12.tar.xz | tar -C /tmp -xJ && \ + cd /tmp/coreboot-24.12 && \ make crossgcc-i386 CPUS=$(nproc) && \ make -C payloads/coreinfo olddefconfig && \ make -C payloads/coreinfo && \ @@ -308,7 +317,8 @@ RUN wget -O - https://coreboot.org/releases/coreboot-24.08.tar.xz | tar -C /tmp make olddefconfig && \ make -j $(nproc) && \ sudo mkdir /opt/coreboot && \ - sudo cp build/coreboot.rom build/cbfstool /opt/coreboot/ + sudo cp build/coreboot.rom build/cbfstool /opt/coreboot/ && \ + rm -rf /tmp/coreboot-24.08 # Create our user/group RUN echo uboot ALL=NOPASSWD: ALL > /etc/sudoers.d/uboot @@ -330,6 +340,7 @@ ENV PATH="/home/uboot/.cargo/bin:${PATH}" # COPY / ADD directives don't work as we need them to. RUN wget -O /tmp/pytest-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/test/py/requirements.txt RUN wget -O /tmp/sphinx-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/doc/sphinx/requirements.txt +RUN wget -O /tmp/binman-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/tools/binman/requirements.txt RUN wget -O /tmp/buildman-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/tools/buildman/requirements.txt RUN wget -O /tmp/patman-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/tools/patman/requirements.txt RUN wget -O /tmp/u_boot_pylib-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/tools/u_boot_pylib/requirements.txt @@ -337,6 +348,7 @@ RUN python3 -m venv /tmp/venv && \ . /tmp/venv/bin/activate && \ pip install -r /tmp/pytest-requirements.txt \ -r /tmp/sphinx-requirements.txt \ + -r /tmp/binman-requirements.txt \ -r /tmp/buildman-requirements.txt \ -r /tmp/patman-requirements.txt \ -r /tmp/u_boot_pylib-requirements.txt && \ From patchwork Thu Feb 19 19:21:26 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1902 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528929; bh=Kd7gkJdmu9W41STIdxCkoZ1HJMp9ty8GHN2PZ2T53kc=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=Zkkoa35rkUSUs48dS/AfDNTqJESycQUIr3nM5wqkU8e8LjOj9cJLRCI0Sx1Qa3fhU AM/sR94T82zTc3/HclFBUdXMhXgZ7JsRbOMqzV+IDDozfIeOFsKShIoggmbveKZC2e bi+Z+Zt5yZTYDJVa6gUOBSkkuvRAjCGhr7mOsilszSs7COBMDVwcixvJJcSh6gUUf4 fFImlDLgAO376Akj5lQPJkHueH5EF+FINehac9cihW2qU4Osj5HqDl31BugRQILQbn vtcwSUVObUcm3jXt3/xpVXfWsR1KP541gUGSlvPaFpAuaEyG9cOTSnt769idc+R9yR Wu7ZhPrqFOKGA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id A858369C7C for ; Thu, 19 Feb 2026 12:22:09 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id WVXyjzxHlkGB for ; Thu, 19 Feb 2026 12:22:09 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528929; bh=Kd7gkJdmu9W41STIdxCkoZ1HJMp9ty8GHN2PZ2T53kc=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=Zkkoa35rkUSUs48dS/AfDNTqJESycQUIr3nM5wqkU8e8LjOj9cJLRCI0Sx1Qa3fhU AM/sR94T82zTc3/HclFBUdXMhXgZ7JsRbOMqzV+IDDozfIeOFsKShIoggmbveKZC2e bi+Z+Zt5yZTYDJVa6gUOBSkkuvRAjCGhr7mOsilszSs7COBMDVwcixvJJcSh6gUUf4 fFImlDLgAO376Akj5lQPJkHueH5EF+FINehac9cihW2qU4Osj5HqDl31BugRQILQbn vtcwSUVObUcm3jXt3/xpVXfWsR1KP541gUGSlvPaFpAuaEyG9cOTSnt769idc+R9yR Wu7ZhPrqFOKGA== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 9091669C77 for ; Thu, 19 Feb 2026 12:22:09 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528926; bh=yZ0mhnzSR33ybs0+Wa6NHc/Ntav4k8bCTgWhtXUwIsk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wL/4+lg11XaREKoPJKFHD3Qb/mUOGf81QvTIlqfMCXJZD54+QulL57wls0KNss+Ca lM1oUIf7OTuzfmR29g37gVRUe5FJL0gBERwPBI2y/AU0cLbOf0XnkWKd7uXZmEkZlE JQZdYx/9NfF5y2v1hkFUrZTcIwflbdWaYBfDLevsOX5tIF5Y4nxNPI2iuxmabssU7K 4fvNF8Q/ubj40QmE2rlEY4xz9M5DgpU0DsNifs6RmNRLpqSyJkKYVYrUJcOk8tFKDj LUktCE7mSNEHhw3kEy53nxJShaBMrNPBXtdRO24obJtYQa7fxy+6po9kemCYxX3i9t A/Dc6Ua8TUCBg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id D710E69C74; Thu, 19 Feb 2026 12:22:06 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id uvUwIDLT3xZk; Thu, 19 Feb 2026 12:22:06 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771528926; bh=aao8u33+mt8r0n2yN57dOwPEyaRSzbD73bbnpPHiGQc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w29OgJs75HkbQIZS2yKtQcxhANAj9zTi5fVdP83lMzXlo9QllMJPNMLjrbd10+7zt iNUUsnlpaerXfmkorjGaYUjMPcO3icQYwcnRnl8dvoFm2G8aIjEVKIjJ5dIxoeE5U9 sBqqhtNOSzFWjDAC+JTmo81InQh+c/LvZVtB75LkSd1kQbNk93KOVsSLoH1KV7z198 o2rJv8/Hi9pELsoFLP+fNvquhcPyDtma+gdjB7R21dKHJTqQ04skJ+l9SaZ8Sj3Lko MQ27Nu/qDAa2RTa135w15QQEiIYIe/Ze1lhpDqaSrlEVeHyEV/FfA9EhGLZJTI6Io0 gVAMhePB21gHA== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 3BFF469C01; Thu, 19 Feb 2026 12:22:06 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Thu, 19 Feb 2026 12:21:26 -0700 Message-ID: <20260219192130.737116-6-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260219192130.737116-1-sjg@u-boot.org> References: <20260219192130.737116-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: TLBHKH3PP5FOXWSPCHLVHC3TXLQJFLZC X-Message-ID-Hash: TLBHKH3PP5FOXWSPCHLVHC3TXLQJFLZC X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Simon Glass , "Claude Opus 4 . 6" X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 5/5] test: trace: Handle trace-cmd caller-info output format List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass Newer versions of trace-cmd append a "<-- caller" suffix to function trace lines, e.g.: u-boot-1 0..... 60.805596: function: initf_malloc <-- initcall_run_f This results in 7 fields per line instead of 5 after splitting, so the existing `len(items) == 5` filter rejects every line, leaving the vals dictionary empty and causing the test to fail. Change the filter to `len(items) >= 5` so that the function name (at index 4) and timestamp (at index 2) are extracted regardless of trailing fields. Co-developed-by: Claude Opus 4.6 Signed-off-by: Simon Glass --- test/py/tests/test_trace.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/py/tests/test_trace.py b/test/py/tests/test_trace.py index 498949372aa..d82bae0acc0 100644 --- a/test/py/tests/test_trace.py +++ b/test/py/tests/test_trace.py @@ -144,14 +144,13 @@ def check_function(ubman, fname, proftool, map_fname, trace_dat): cmd = f"trace-cmd report -l {trace_dat} |grep -E '(initf_|initr_)'" out = utils.run_and_log(ubman, ['sh', '-c', cmd]) - # Format: + # Format (older trace-cmd): # u-boot-1 0..... 60.805596: function: initf_malloc - # u-boot-1 0..... 60.805597: function: initf_malloc - # u-boot-1 0..... 60.805601: function: initf_bootstage - # u-boot-1 0..... 60.805607: function: initf_bootstage + # Format (newer trace-cmd, includes caller): + # u-boot-1 0..... 60.805596: function: initf_malloc <-- initcall_run_f lines = [line.replace(':', '').split() for line in out.splitlines()] - vals = {items[4]: float(items[2]) for items in lines if len(items) == 5} + vals = {items[4]: float(items[2]) for items in lines if len(items) >= 5} base = None max_delta = 0 for timestamp in vals.values():