From patchwork Mon Nov 4 13:39:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2006247 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=ieyabTfg; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XhszX4SZYz1xxN for ; Tue, 5 Nov 2024 00:40:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CE42C88E4B; Mon, 4 Nov 2024 14:40:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="ieyabTfg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DE00488DA3; Mon, 4 Nov 2024 14:40:06 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd35.google.com (mail-io1-xd35.google.com [IPv6:2607:f8b0:4864:20::d35]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A403A88A0A for ; Mon, 4 Nov 2024 14:40:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd35.google.com with SMTP id ca18e2360f4ac-8323b555a6aso240877139f.3 for ; Mon, 04 Nov 2024 05:40:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730727603; x=1731332403; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=49sk/QDzLz0+2BFgLHnZzFO16Sf0EAWdbzCvDQ+ykSw=; b=ieyabTfgflhmLhFGcJoxFaFivIFABOK+S4ghglGM4ElPSnyCWIqdBFIkNdIOSd7Pfd xwpueo9JHruP7cUUy+zMni2aMxKy/7Vaak5EjIS5znb1ru9eHWQfrl5ULezEBDrcmS+X slQZn8mOMbIIP6IxaDFiqKQPXlYFEG8ltjptg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730727603; x=1731332403; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=49sk/QDzLz0+2BFgLHnZzFO16Sf0EAWdbzCvDQ+ykSw=; b=O4C9e6NbdSaiP6s5L/dKxXkRAXyckjNiZc/ADGpBV965CgS2N03r8BUgx2qDLE2k+4 T4O+pqYcLM2hxJUBfjvBDSMZxl1qC1t6vOCYABPnDu2bMRjMqE0HWt91zg38CDpPIa6d RounctlhMV2f4LKI8bEat9k1JkVApWbeEvwcSL6GE4fH7ZB4/EJKt++SHlrU8V92uyv9 yaM9klH9w/iRXSm+QOBHwoTDa7Uum1JzcipzEyW0k4UU2dV7Yu5uOoMvSambPB/Recf+ eok+JtSU7E47g28sDZoputOvILBJUo5wozfl/uT4enypKIeT4cMXFHrTKrKQpzvQAo9b yZww== X-Gm-Message-State: AOJu0YzCgjK7JzK42+XiMk8h3sMi7+MlX6bJK6kvmMqTYw4GG1SJh5hp ZBAcVT2tkUT8cJbr4EWMOSZGaw6AbjefR3l/UeFguQTv4pB37/ZTtxpOUPCP3P8cJ7WgzJ6Aevo = X-Google-Smtp-Source: AGHT+IGWvR13rAqdS6aGX9yOG3FhaIJK+L28rhzi0+cLK2iEoMxaIGLXIi8RR3Wd01QGfADOPKKwiw== X-Received: by 2002:a05:6602:164f:b0:83a:9488:154c with SMTP id ca18e2360f4ac-83b64f3b524mr1587113239f.3.1730727602865; Mon, 04 Nov 2024 05:40:02 -0800 (PST) Received: from chromium.org (c-107-2-138-191.hsd1.co.comcast.net. [107.2.138.191]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4de048895f3sm1935128173.12.2024.11.04.05.40.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 05:40:02 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Heinrich Schuchardt , Tom Rini , Simon Glass , Ilias Apalodimas , Marek Vasut Subject: [PATCH 1/9] sandbox: efi_loader: Correct use of addresses as pointers Date: Mon, 4 Nov 2024 06:39:45 -0700 Message-Id: <20241104133954.840994-2-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241104133954.840994-1-sjg@chromium.org> References: <20241104133954.840994-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The cache-flush function is incorrect which causes a crash in the remoteproc tests with arm64. Fix both problems by using map_sysmem() to convert an address to a pointer and map_to_sysmem() to convert a pointer to an address. Also update the image-loader's cache-flushing logic. As discussed some time ago, it would be good to update the way EFI_LOADER uses addresses and pointers, particularly around memory allocation. Ideally we would use addresses internally, with pointers only exposed via the external API, even where pointers are in fact u64 values. Signed-off-by: Simon Glass Fixes: 3286d223fd7 ("sandbox: implement invalidate_icache_all()") --- arch/sandbox/cpu/cache.c | 8 +++++++- drivers/remoteproc/rproc-elf-loader.c | 18 +++++++++++------- lib/efi_loader/efi_image_loader.c | 3 ++- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/arch/sandbox/cpu/cache.c b/arch/sandbox/cpu/cache.c index c8a5e64214b..96b3da47e8e 100644 --- a/arch/sandbox/cpu/cache.c +++ b/arch/sandbox/cpu/cache.c @@ -4,12 +4,18 @@ */ #include +#include #include void flush_cache(unsigned long addr, unsigned long size) { + void *ptr; + + ptr = map_sysmem(addr, size); + /* Clang uses (char *) parameters, GCC (void *) */ - __builtin___clear_cache((void *)addr, (void *)(addr + size)); + __builtin___clear_cache(map_sysmem(addr, size), ptr + size); + unmap_sysmem(ptr); } void invalidate_icache_all(void) diff --git a/drivers/remoteproc/rproc-elf-loader.c b/drivers/remoteproc/rproc-elf-loader.c index ab1836b3f07..0b3941b7798 100644 --- a/drivers/remoteproc/rproc-elf-loader.c +++ b/drivers/remoteproc/rproc-elf-loader.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -180,6 +181,7 @@ int rproc_elf32_load_image(struct udevice *dev, unsigned long addr, ulong size) for (i = 0; i < ehdr->e_phnum; i++, phdr++) { void *dst = (void *)(uintptr_t)phdr->p_paddr; void *src = (void *)addr + phdr->p_offset; + ulong dst_addr; if (phdr->p_type != PT_LOAD) continue; @@ -195,10 +197,11 @@ int rproc_elf32_load_image(struct udevice *dev, unsigned long addr, ulong size) if (phdr->p_filesz != phdr->p_memsz) memset(dst + phdr->p_filesz, 0x00, phdr->p_memsz - phdr->p_filesz); - flush_cache(rounddown((unsigned long)dst, ARCH_DMA_MINALIGN), - roundup((unsigned long)dst + phdr->p_filesz, + dst_addr = map_to_sysmem(dst); + flush_cache(rounddown(dst_addr, ARCH_DMA_MINALIGN), + roundup(dst_addr + phdr->p_filesz, ARCH_DMA_MINALIGN) - - rounddown((unsigned long)dst, ARCH_DMA_MINALIGN)); + rounddown(dst_addr, ARCH_DMA_MINALIGN)); } return 0; @@ -377,6 +380,7 @@ int rproc_elf32_load_rsc_table(struct udevice *dev, ulong fw_addr, const struct dm_rproc_ops *ops; Elf32_Shdr *shdr; void *src, *dst; + ulong dst_addr; shdr = rproc_elf32_find_rsc_table(dev, fw_addr, fw_size); if (!shdr) @@ -398,10 +402,10 @@ int rproc_elf32_load_rsc_table(struct udevice *dev, ulong fw_addr, (ulong)dst, *rsc_size); memcpy(dst, src, *rsc_size); - flush_cache(rounddown((unsigned long)dst, ARCH_DMA_MINALIGN), - roundup((unsigned long)dst + *rsc_size, - ARCH_DMA_MINALIGN) - - rounddown((unsigned long)dst, ARCH_DMA_MINALIGN)); + dst_addr = map_to_sysmem(dst); + flush_cache(rounddown(dst_addr, ARCH_DMA_MINALIGN), + roundup(dst_addr + *rsc_size, ARCH_DMA_MINALIGN) - + rounddown(dst_addr, ARCH_DMA_MINALIGN)); return 0; } diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index 0ddf69a0918..bb58cf1badb 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -977,7 +978,7 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle, } /* Flush cache */ - flush_cache((ulong)efi_reloc, + flush_cache(map_to_sysmem(efi_reloc), ALIGN(virt_size, EFI_CACHELINE_SIZE)); /* From patchwork Mon Nov 4 13:39:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2006248 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=gZL/JZi3; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Xhszb3ttYz1xxW for ; Tue, 5 Nov 2024 00:40:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3B0B388D5D; Mon, 4 Nov 2024 14:40:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="gZL/JZi3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BD3C488D3A; Mon, 4 Nov 2024 14:40:08 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4629288D45 for ; Mon, 4 Nov 2024 14:40:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd2c.google.com with SMTP id ca18e2360f4ac-83aad8586d3so177521839f.1 for ; Mon, 04 Nov 2024 05:40:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730727604; x=1731332404; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QWS1vB5shJVhAwh6dr2c75GxM5dKSk7hj7YE9Gs5Dpg=; b=gZL/JZi3PfeH6jXuwtAyC+mwCrvI7dooX/b82Y1A0b1oUafiu1vP2ePYlDljGA2C6j npNy4dMUuxecPbqvtJxoHeTU5VvXM0AANFFyexsX3NlGGTZ4xNKyM5L+M5BGr5T54EUZ DB/tHUJUCjBxO3l3vah0P8c1TlZ8qkprTdom0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730727604; x=1731332404; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QWS1vB5shJVhAwh6dr2c75GxM5dKSk7hj7YE9Gs5Dpg=; b=e6imGEmZV8sLv42SfQ4L+/XGmm6O7jlkXr4o/SJazLOPpOxU9dsdQkrsbW42m7oHPM 3Mn8Ncj5Sc/RTtnjaPssrq/OqIDa9pEI+YyR63J3aCra6IRXPF4x/qcLAnQoDgG/UlRf 6KUFJjBQjuNT/wcaXTkk5p2VLMvruqZNxsFH0VzcncMebdbxhAAy9+ovoEIwnI0LpAjb QRItBQ9Bz3N67y1369zZMC9Ogk8hy4Ar4HTTDK0/KZxWIaXPDBEN3ebm86qJWPIxs2/0 qRb44SJOsEAb0efrJauacOg4ZsIv7Arw2mhj1os1uEOI9n/u6ny8Xw09O4W8hK5TEbph dzcQ== X-Gm-Message-State: AOJu0YxAFJPxoc9lsp3h5idIUgcLu4sBnW/dE9fZybFH0r7DmBhlt/UY zbY1nZpwrHgGM98GhVonCxOjy5tAroO7PgX3NOqW08/Ni+nGJwj6lRz6xZY3TA8yxtdkhtcpvhE = X-Google-Smtp-Source: AGHT+IGlSRcd0KNC3oD4rKQC3l6Jcj/dUhNndZTKMN/wvRVkbGqjQ5hGL0oCxXxfmrbuUPkPDjizjA== X-Received: by 2002:a05:6602:1492:b0:82a:a76a:1779 with SMTP id ca18e2360f4ac-83b71996903mr1319821739f.8.1730727604431; Mon, 04 Nov 2024 05:40:04 -0800 (PST) Received: from chromium.org (c-107-2-138-191.hsd1.co.comcast.net. [107.2.138.191]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4de048895f3sm1935128173.12.2024.11.04.05.40.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 05:40:03 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Heinrich Schuchardt , Tom Rini , Simon Glass , Ilias Apalodimas , Mattijs Korpershoek , Raymond Mao Subject: [PATCH 2/9] test: Adjust print_ut test to use unsigned char Date: Mon, 4 Nov 2024 06:39:46 -0700 Message-Id: <20241104133954.840994-3-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241104133954.840994-1-sjg@chromium.org> References: <20241104133954.840994-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Since char is unsigned on arm64, this test currently fails. It seems better to use unsigned anyway, since 0xff is written into the string at the start. Signed-off-by: Simon Glass Reviewed-by: Heinrich Schuchardt --- test/print_ut.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/print_ut.c b/test/print_ut.c index f5e607b21a3..7e5c015f3a7 100644 --- a/test/print_ut.c +++ b/test/print_ut.c @@ -242,7 +242,7 @@ PRINT_TEST(print_display_buffer, UTF_CONSOLE); static int print_hexdump_line(struct unit_test_state *uts) { - char *linebuf; + u8 *linebuf; u8 *buf; int i; @@ -255,10 +255,10 @@ static int print_hexdump_line(struct unit_test_state *uts) linebuf = map_sysmem(0x400, BUF_SIZE); memset(linebuf, '\xff', BUF_SIZE); ut_asserteq(-ENOSPC, hexdump_line(0, buf, 1, 0x10, 0, linebuf, 75)); - ut_asserteq(-1, linebuf[0]); + ut_asserteq(0xff, linebuf[0]); ut_asserteq(0x10, hexdump_line(0, buf, 1, 0x10, 0, linebuf, 76)); ut_asserteq(0, linebuf[75]); - ut_asserteq(-1, linebuf[76]); + ut_asserteq(0xff, linebuf[76]); unmap_sysmem(buf); From patchwork Mon Nov 4 13:39:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2006249 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=BvmlzdWi; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Xhszm4x49z1xxN for ; Tue, 5 Nov 2024 00:40:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A286B88F0C; Mon, 4 Nov 2024 14:40:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="BvmlzdWi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 23B2888C75; Mon, 4 Nov 2024 14:40:11 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd2d.google.com (mail-io1-xd2d.google.com [IPv6:2607:f8b0:4864:20::d2d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 851F288D14 for ; Mon, 4 Nov 2024 14:40:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd2d.google.com with SMTP id ca18e2360f4ac-83ab21c269eso160052639f.2 for ; Mon, 04 Nov 2024 05:40:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730727606; x=1731332406; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nVnNDZZtn7r/7hQkDrYKCS/sEwK8Lyq8RbCiYAlTEUc=; b=BvmlzdWiX+Q3t84kuLj1fU0i34qWpvBIYMRTLkj1nGL0WTwLMhSjayrc8LjeZqR3Yw 9yKIpWHD38OSvLRmZ4JN0besRes0k6EZjYfgl7q5qv+L6UCj89vQre1S0OsKcD6Y77ds bb6xsQqmvCd4JqdQognZWvba2Ra9eBPPiOpPM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730727606; x=1731332406; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nVnNDZZtn7r/7hQkDrYKCS/sEwK8Lyq8RbCiYAlTEUc=; b=CNrS+440TYiQy9bjV+++qq92IFdjfWq6GmSe9cCME7CCczqDtN+G45AXhGZuG7iSVf /QATlOOjrUYtaR11jzKVtl6iWqmFeHUFvs3v2SM4VjW91O/rKFMhLpVEB1xHjErXvZcD KJFQzJA56CzQBlPL+Xp4+nI/tWjJXYScplHPrRwbeA9eIzxZpnipqzbRyxBqq4/ahQ/y MNqO2PGQRy4fTuuZ1oAaxHE2aq6E1nbMOHi9owVKq7AGPLpMuqE86FfXliPMrxhUxBfk xUMga8ZzhrshFJ8vVvyDaWjuZrNrLYrTxNFV9c5aW9OXsgbqdo/VUQIBFK2WDHUoPB0w S+ug== X-Gm-Message-State: AOJu0YzziMayRchG8L9aD0r0cfYbtobDYgaP61h1ZIl/MGU/ELKec1mf OP0T4wvthpC2cidWjj2M3L+iUw9xhCHAGt7Q5MANa2Fm76kmiZ/r+1dXCX58FBu/TBLB541M+yU = X-Google-Smtp-Source: AGHT+IHfWrjnp2tbp6xH+zk5Drz82qHTW4ROAhbewqejv5pzGqKh3AJtrCfBMBV2ZGC3def3G2CYtQ== X-Received: by 2002:a05:6602:1509:b0:83a:b645:c902 with SMTP id ca18e2360f4ac-83b7194b784mr1388421239f.6.1730727606337; Mon, 04 Nov 2024 05:40:06 -0800 (PST) Received: from chromium.org (c-107-2-138-191.hsd1.co.comcast.net. [107.2.138.191]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4de048895f3sm1935128173.12.2024.11.04.05.40.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 05:40:04 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Heinrich Schuchardt , Tom Rini , Simon Glass Subject: [PATCH 3/9] docker: Support building for multiple architectures Date: Mon, 4 Nov 2024 06:39:47 -0700 Message-Id: <20241104133954.840994-4-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241104133954.840994-1-sjg@chromium.org> References: <20241104133954.840994-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Add instructions on how to build the file for multiple architectures. Add a message indicating what is happening. Signed-off-by: Simon Glass --- tools/docker/Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 967ac89fbde..c9d794082c8 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -2,6 +2,9 @@ # This Dockerfile is used to build an image containing basic stuff to be used # to build U-Boot and run our test suites. +# Build with (for example): +# docker buildx build --platform linux/arm64/v8,linux/amd64 --tag sjg20/u-boot-gitlab-ci-runner-multiarch:jammy-20240808-03Nov2024 . + FROM ubuntu:jammy-20240808 LABEL org.opencontainers.image.authors="Tom Rini " LABEL org.opencontainers.image.description=" This image is for building U-Boot inside a container" @@ -9,6 +12,10 @@ LABEL org.opencontainers.image.description=" This image is for building U-Boot i # Make sure apt is happy ENV DEBIAN_FRONTEND=noninteractive +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "Building $BUILDPLATFORM, for target $TARGETPLATFORM" + # 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 - From patchwork Mon Nov 4 13:39:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2006250 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=MhwRne9X; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Xhszz1qBcz1xxN for ; Tue, 5 Nov 2024 00:40:46 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 115B888FB3; Mon, 4 Nov 2024 14:40:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="MhwRne9X"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CB7DA88F4E; Mon, 4 Nov 2024 14:40:12 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1350388D3C for ; Mon, 4 Nov 2024 14:40:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd2e.google.com with SMTP id ca18e2360f4ac-83ab21c26f1so173367739f.2 for ; Mon, 04 Nov 2024 05:40:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730727608; x=1731332408; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UcMZ+oSWwVo4Ac6irP4BnEw8/xOSiR6TBV/JbJptv+Q=; b=MhwRne9XHInX7fwVs1pBGx60+HGU70HdiCT4sfixolYX9rS29bk0DFDZ+B3Ewf1o+k KTuu7fDdhlu9xKrTXuhMduR9XTty22p1bbqd/Ad344x6keuWJ/BujxegZPruLd3q3K5Q nK4b2556cdrk151AjIRPOlsO73Yu/nrJH25E0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730727608; x=1731332408; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UcMZ+oSWwVo4Ac6irP4BnEw8/xOSiR6TBV/JbJptv+Q=; b=XHjxwAcT1jhjz+1b78rwDkTQkLHIJooW2Znf3d7cTazcX69lcFYVXpRsSBO0r25ENj GrZ3HY/kFTPAM/wIppeFz1eIpu9ijGg8cNI3dMInUYOd6LdhkxrY+4XAhv92ioxjeH36 v3fFGy1WDko4lbyg44RVeZcx9mhdN8++ifFkw6DcyTVZWjDyrTtSJnOTPOqW+xqiXxke qOigZZCDZ30T804DGbTP7piIGzUEGyfTjctgppSwPTzFV3075ZfRqni8DFIf8COaAvdw CtidC5N3/qfSjqew+VOCQygHkvZzXBnvn9467MhttFO/IHPN8YTeogzZSKxA9E+AshHU MkLA== X-Gm-Message-State: AOJu0Yw3k9mRprpue8fXWBfHFJtZvOaf1AxBN+ArfHfHL65kR52CcJZh ytxjP5HK26v57Qaw1+dIrQoFNkrRQ3r9eHNJPQypAjQnl2cr9KKps5hISOKOLSQipHj0nQt/+Qg = X-Google-Smtp-Source: AGHT+IGEX1cMpUhDvQ1GoonaFaN4pv007CIX53mYxc1yvCW3HDmpMGVmE2G0/kBByuC+9kspDvab7g== X-Received: by 2002:a05:6602:3d3:b0:83a:b2c1:8b40 with SMTP id ca18e2360f4ac-83b567990c5mr2080209039f.13.1730727608272; Mon, 04 Nov 2024 05:40:08 -0800 (PST) Received: from chromium.org (c-107-2-138-191.hsd1.co.comcast.net. [107.2.138.191]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4de048895f3sm1935128173.12.2024.11.04.05.40.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 05:40:07 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Heinrich Schuchardt , Tom Rini , Simon Glass Subject: [PATCH 4/9] docker: Adjust packages for arm64 Date: Mon, 4 Nov 2024 06:39:48 -0700 Message-Id: <20241104133954.840994-5-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241104133954.840994-1-sjg@chromium.org> References: <20241104133954.840994-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The package names are slightly different for arm64 and we don't seem to have a linux-image-kvm package. Provide a different set for arm64 Signed-off-by: Simon Glass --- tools/docker/Dockerfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index c9d794082c8..c4c3dc5a901 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -39,7 +39,12 @@ RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_ RUN wget -O - https://github.com/foss-xtensa/toolchain/releases/download/2020.07/x86_64-2020.07-xtensa-dc233c-elf.tar.gz | tar -C /opt -xz # Update and install things from apt now -RUN apt-get update && apt-get install -y \ +RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ + EXTRA_PACKAGES="grub-efi-arm64-bin linux-image-generic"; \ + else \ + EXTRA_PACKAGES="grub-efi-amd64-bin grub-efi-ia32-bin libc6-i386 linux-image-kvm"; \ + fi; \ + apt-get update && apt-get install -y \ automake \ autopoint \ bc \ @@ -65,13 +70,10 @@ RUN apt-get update && apt-get install -y \ gnu-efi \ gnutls-dev \ graphviz \ - grub-efi-amd64-bin \ - grub-efi-ia32-bin \ help2man \ iasl \ imagemagick \ iputils-ping \ - libc6-i386 \ libconfuse-dev \ libgit2-dev \ libjson-glib-dev \ @@ -89,7 +91,6 @@ RUN apt-get update && apt-get install -y \ libtool \ libudev-dev \ libusb-1.0-0-dev \ - linux-image-kvm \ lzma-alone \ lzop \ mount \ @@ -126,6 +127,7 @@ RUN apt-get update && apt-get install -y \ xilinx-bootgen \ xxd \ zip \ + ${EXTRA_PACKAGES} \ && rm -rf /var/lib/apt/lists/* # Make kernels readable for libguestfs tools to work correctly From patchwork Mon Nov 4 13:39:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2006251 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=B7IAhSJP; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Xht080gF4z1xxN for ; Tue, 5 Nov 2024 00:40:56 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6EF0188D3C; Mon, 4 Nov 2024 14:40:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="B7IAhSJP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4B0A689000; Mon, 4 Nov 2024 14:40:14 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DF5F788C7C for ; Mon, 4 Nov 2024 14:40:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd29.google.com with SMTP id ca18e2360f4ac-83ac05206f6so158853539f.2 for ; Mon, 04 Nov 2024 05:40:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730727610; x=1731332410; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DEWP3z3rWYY5ipu4wycSwf1COICFT3sk4O2J+gQGz/c=; b=B7IAhSJPzVQGu3onlHsoxBPT8tXWqHKZcjSztKEq7HiKvA9nr78AvWePugHhrlBW5d miXFfPiMigxmV7VXxKuR8fUgeHKl3sK3L9ByfQnv6y6c0YEMmTtUIp0F8vHjXSNadjwn S+waFqPhlXRxOW6XUjYsbZs3Y3cTV6TykYZ/0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730727610; x=1731332410; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DEWP3z3rWYY5ipu4wycSwf1COICFT3sk4O2J+gQGz/c=; b=CvlMGWoACZx+43cryOznWgSTwSmo9Gn3nS8pUR+uhhzSVjIqJLwoQcVZqQEfiJ7fA0 dlZ9uEWYPTD4MZQAD6kBFqMNSsYuhMkO3ej0lTyJs7nOLQxaz9Mzdp2j44GcM4jyAGOf xSu7zG+Hfa50t5+EA3fu/r0Rvd2itjryQg441OoSK5ZDII2E4fHs/w/9+re04PPMbwpp KOEiVHZpAeW56kGIodJrQ5+eUpPSxftPdmLvRgjkr6uLPyVa6JOIQd40JZHQWxXBtARf fx6OBPcnvOVUTS/W0BhOQiTkxnWNB3cAKj7NYn2s7YzHDkSvoUXaKPkI3XD/5unNyLxE 4u/A== X-Gm-Message-State: AOJu0YzLtIMaeTIOiWv+Hl7kL72cTmhI8P5Jn6YB2+sQIdTVc7yB2d0Q s5VjUqQu+Eav41hYy3aJbDFM9HAfjNodtI/jgYGOVJVFTO5uL/unNhBi529I8AIOIC5wIlGK9SU = X-Google-Smtp-Source: AGHT+IFEJWpn1onjd4h85/8C0MwbHNMcvPN6cLuPkbJUCzCW2VO1BUG9+jRraYwy3NW4zswgqh+RwQ== X-Received: by 2002:a05:6602:6b10:b0:835:4d07:9d46 with SMTP id ca18e2360f4ac-83b650688efmr1385682439f.15.1730727609697; Mon, 04 Nov 2024 05:40:09 -0800 (PST) Received: from chromium.org (c-107-2-138-191.hsd1.co.comcast.net. [107.2.138.191]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4de048895f3sm1935128173.12.2024.11.04.05.40.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 05:40:08 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Heinrich Schuchardt , Tom Rini , Simon Glass Subject: [PATCH 5/9] docker: Drop grub for arm64 Date: Mon, 4 Nov 2024 06:39:49 -0700 Message-Id: <20241104133954.840994-6-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241104133954.840994-1-sjg@chromium.org> References: <20241104133954.840994-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean This doesn't build on arm64 at present, so drop it for now. We only expect to run sandbox tests, so perhaps it isn't needed. Signed-off-by: Simon Glass --- tools/docker/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index c4c3dc5a901..60106a82801 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -134,7 +134,9 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ RUN chmod +r /boot/vmlinu* # Build GRUB UEFI targets for ARM & RISC-V, 32-bit and 64-bit -RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ +# This fails on arm64 +RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ + git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ cd /tmp/grub && \ git checkout grub-2.06 && \ git config --global user.name "GitLab CI Runner" && \ @@ -184,7 +186,8 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ lsefisystab loadenv lvm minicmd normal part_msdos part_gpt reboot \ search search_fs_file search_fs_uuid search_label serial sleep test \ true && \ - rm -rf /tmp/grub + rm -rf /tmp/grub; \ + fi RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \ cd /tmp/qemu && \ From patchwork Mon Nov 4 13:39:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2006252 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=FUsJnNdu; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Xht0M6sxmz1xxN for ; Tue, 5 Nov 2024 00:41:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CA82788D3A; Mon, 4 Nov 2024 14:40:18 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="FUsJnNdu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3A7B488D90; Mon, 4 Nov 2024 14:40:17 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 68BFC88F73 for ; Mon, 4 Nov 2024 14:40:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd29.google.com with SMTP id ca18e2360f4ac-83ac4dacaf9so153737039f.2 for ; Mon, 04 Nov 2024 05:40:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730727611; x=1731332411; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vWSD+RoTUL/HykCvtgZb3MFN/1WZRzfooJ8T7wEIJB0=; b=FUsJnNduKHPzM01AYq+dOdnWsFi6x+TZ0pnCrAZEzBPWAg+q/FzjeUnp7QslLz2NDn urZB0tn5INFDat+Di56AqqwhttrSY+8caiQr1Bn4uzRo7C7LX8/N8uxoORDynkKfHRGT +96cUV2tn8yz/i717ZYex4OUeTte18wTqlRtQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730727611; x=1731332411; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vWSD+RoTUL/HykCvtgZb3MFN/1WZRzfooJ8T7wEIJB0=; b=E3kQonkwBtLosy8sfTj5C/KG9IdPNQW2N2xu1YKFMPCXw+S0ktDv2DXO8RFaiTn9af +cW9eJiHoyf8RGl4Qx4VjfJy00hY+YMkp/3pmEZ3R6TSDfnVtSfAyUEf9mdiZVdeCPiz c01OBqHV9Zt3DJL8ET99xxIYM/xPJxFHydRxYroyGEky+eHyyJpjSCUG+mzUBJ0zRI79 ePTXL6oC1DLkzrJ23aD/8XU5vTnFstaMC3ijAk8XASJN3Ee/C3iRJFTw+YwyxxGo9vf+ flnB89ZoTMIqJzGjrYk7783I87Hyox0eBsVgnidcvT5rGNn4px+zO+R5K5O3MoP3l0XR 04bA== X-Gm-Message-State: AOJu0YwSW4br/k9ctJKzV0RfiJeHduhHOgNqX0DVMAD29uXy29mC0g11 j4G6VxdmcH7TiTP9Ku4Ll9jtMXuAMHVu0eCXAXjk2KrBe6rAdjEZij0pIsZlw5/DymI/bjbwYCE = X-Google-Smtp-Source: AGHT+IEngkSrwN0osp4p0w48/svXL2RZRoD9i1q4Q3BC57g2Vk7fQaMb4qQOpQmauE4VnhnSSvp4gw== X-Received: by 2002:a05:6602:1695:b0:83b:2167:650f with SMTP id ca18e2360f4ac-83b6503964emr1951112139f.10.1730727611577; Mon, 04 Nov 2024 05:40:11 -0800 (PST) Received: from chromium.org (c-107-2-138-191.hsd1.co.comcast.net. [107.2.138.191]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4de048895f3sm1935128173.12.2024.11.04.05.40.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 05:40:10 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Heinrich Schuchardt , Tom Rini , Simon Glass Subject: [PATCH 6/9] docker: Drop tracing for arm64 Date: Mon, 4 Nov 2024 06:39:50 -0700 Message-Id: <20241104133954.840994-7-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241104133954.840994-1-sjg@chromium.org> References: <20241104133954.840994-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean This doesn't build on arm64 at present, so drop it for now. This can be revisited if we wish to support arm64 for the sandbox trace-test. Signed-off-by: Simon Glass --- tools/docker/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 60106a82801..73fdd1a4302 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -240,7 +240,8 @@ RUN git clone https://github.com/stefanberger/swtpm /tmp/swtpm && \ rm -rf /tmp/swtpm # Build trace-cmd -RUN mkdir /tmp/trace && \ +RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ + mkdir /tmp/trace && \ git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git /tmp/trace/libtraceevent && \ cd /tmp/trace/libtraceevent && \ make -j$(nproc) && \ @@ -253,7 +254,8 @@ RUN mkdir /tmp/trace && \ cd /tmp/trace/trace-cmd && \ make -j$(nproc) && \ sudo make install && \ - rm -rf /tmp/trace + rm -rf /tmp/trace; \ + fi # Build coreboot RUN wget -O - https://coreboot.org/releases/coreboot-24.08.tar.xz | tar -C /tmp -xJ && \ From patchwork Mon Nov 4 13:39:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2006253 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Jol1JWZT; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Xht0Z18dwz1xxN for ; Tue, 5 Nov 2024 00:41:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 36A0A88D90; Mon, 4 Nov 2024 14:40:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Jol1JWZT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6138888C7C; Mon, 4 Nov 2024 14:40:18 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D9A5D89000 for ; Mon, 4 Nov 2024 14:40:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd33.google.com with SMTP id ca18e2360f4ac-83abe4524ccso156683039f.1 for ; Mon, 04 Nov 2024 05:40:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730727613; x=1731332413; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tzzcU3cApD8N/Fex954cQUsPauKGOJbCbvA/+ftAKp4=; b=Jol1JWZTVwt3ftcGSah/txD690PaNY5iWvd1MlS3x6HNl+zT65JdU+p3VKcYg+QNYf YS8/xQ5kEieOI/qrPTSajbC0AGXOAc7jKJ7RIkDV13ltK0NFrFKefVpnefBGQSOsjYBe PHIwhKBPr+sfP8Zirf1C7PUz91n6PfQKMpQeY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730727613; x=1731332413; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tzzcU3cApD8N/Fex954cQUsPauKGOJbCbvA/+ftAKp4=; b=i2R0Ypog+IyNW7wVbDuFtIPwdCBd/UNlG+grRfk5GX/plS749SMYzXlMjRTH3KQlGt vWN64csBnFGVC/L8hTllCzCJd8ItZz5BRnyR2t0P3MGBp7kayywseHLR9g2rtkl5kQvJ Ca1TCSWAd7ZB8aFTdtJjetvt0Anu+HqUHLGWuLe+RzoJN6nm9/c+hLQOOqafRXLtV1z2 ZJBryfypjsIR7Ry7BYQAQhDzJqfmaGumCmA0eZiMKAJeTILXxEBOqAdG7qrv6i0YuwO9 tFY7q7cMLWf6S9USfo7GwWdzQgGcV/4ti2EcS/RgsgVoQ59cMXCaRbJKFfRC/3yoXS8z TaOw== X-Gm-Message-State: AOJu0YzgyGbIwL2qVFD8rjykMJsN9Kmvr6mQ8VAUBJFO6LgBobdlslXg F4uLK82KzxhAOh8VJBBdfDnAAb076NZ5XlFasvsBGrFPAKTagtT/2GfPzhZn2sTLfRUeHeAjVY4 = X-Google-Smtp-Source: AGHT+IGryWFZN0ivN2qk+dWXc6+nGhLZ6s9iFHW5/RmhFJZmFCzlLLRjt2ptoD6QB9HAIMeFJr/5Iw== X-Received: by 2002:a05:6602:29ce:b0:82c:ed57:ebd9 with SMTP id ca18e2360f4ac-83b650372b4mr1900715839f.10.1730727613067; Mon, 04 Nov 2024 05:40:13 -0800 (PST) Received: from chromium.org (c-107-2-138-191.hsd1.co.comcast.net. [107.2.138.191]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4de048895f3sm1935128173.12.2024.11.04.05.40.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 05:40:12 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Heinrich Schuchardt , Tom Rini , Simon Glass Subject: [PATCH 7/9] docker: Drop coreboot for arm64 Date: Mon, 4 Nov 2024 06:39:51 -0700 Message-Id: <20241104133954.840994-8-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241104133954.840994-1-sjg@chromium.org> References: <20241104133954.840994-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean This isn't needed for sandbox builds and coreboot isn't much used on arm64, nor does U-Boot have a build that supports running from coreboot on any ARM target. So drop it. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- tools/docker/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 73fdd1a4302..ae3d4685869 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -258,7 +258,8 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ fi # Build coreboot -RUN wget -O - https://coreboot.org/releases/coreboot-24.08.tar.xz | tar -C /tmp -xJ && \ +RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ + wget -O - https://coreboot.org/releases/coreboot-24.08.tar.xz | tar -C /tmp -xJ && \ cd /tmp/coreboot-24.08 && \ make crossgcc-i386 CPUS=$(nproc) && \ make -C payloads/coreinfo olddefconfig && \ @@ -269,7 +270,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/; \ + fi # Create our user/group RUN echo uboot ALL=NOPASSWD: ALL > /etc/sudoers.d/uboot From patchwork Mon Nov 4 13:39:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2006254 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=EBfDEhOn; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Xht0p4qg2z1xxN for ; Tue, 5 Nov 2024 00:41:28 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A154789076; Mon, 4 Nov 2024 14:40:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="EBfDEhOn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6EB1B88F41; Mon, 4 Nov 2024 14:40:19 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 239B888D13 for ; Mon, 4 Nov 2024 14:40:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd2e.google.com with SMTP id ca18e2360f4ac-83abcfb9f37so178470839f.1 for ; Mon, 04 Nov 2024 05:40:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730727615; x=1731332415; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VKyyy749CEwE0Vln7HQ2ISAnIhx4/RXq0RG6k/UIKp4=; b=EBfDEhOne/hwqXte+ZpFjkl2wtMcL+jA+ufM5dDhQpA5Bmm9uBmhuDjmpedB6u2Kpr +IBwJJ4L0ottKsWLM2AVRgkP48Kf9K7MImW9pjZBtEzquXy99lYfvqJ7yP3HSwrl/Vo9 PvhjnOnTuur7fpjbpUR31ecuoyRweJlsCIox0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730727615; x=1731332415; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VKyyy749CEwE0Vln7HQ2ISAnIhx4/RXq0RG6k/UIKp4=; b=qS+MRbbg+JnElMpWeD94r+eHNqGYsTf+ybMXIZ11fXYSWruV25n3do48NONdCvnC9g KkvNGOVAcYWzF/DzLiiS5FpFlYvRalCLOD0zLRz+y48f+Mcaega73HmFTh6dpMLY/Dvs BiTAxfzW06Oko9zPy/+ri5p1GYs5IKeWrBx1YXXfP49qY2hg2zYKhJlYxA4nt1ppnv5v 0ADUXVDXJg8GtBDTynomIZ0SvkKTgsbNg/jic1iOU199aOkDDoaw/5BXHNDdIWbdslCr mv0TO2OB67QR/E2gECj4taVfm7bJs9hAxbq9OqWdIO4R0M5HSl9rpoAM2jJQiFy1Ru8R xPjQ== X-Gm-Message-State: AOJu0YypW4nI/C7hV/OqQvU5RGu0x+Eq9vJcIhnt/bzU10wgdEKl5khF LLqXqzwkYpzzwO1JO6C1WHgkgvDldNspgUAIjhEy5200kb1+5Y0/jDgM/6CuWDfg5sSeAgjYLMw = X-Google-Smtp-Source: AGHT+IFf7CqM1y7j4f1alNYvqs9iRBD/f4r4+klzbot1eV4WNjKmYeIay9CwMQ+95M4yXroiXcQPqw== X-Received: by 2002:a05:6602:1589:b0:837:7d54:acf1 with SMTP id ca18e2360f4ac-83b1c3b7c50mr3398476039f.2.1730727614625; Mon, 04 Nov 2024 05:40:14 -0800 (PST) Received: from chromium.org (c-107-2-138-191.hsd1.co.comcast.net. [107.2.138.191]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4de048895f3sm1935128173.12.2024.11.04.05.40.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 05:40:13 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Heinrich Schuchardt , Tom Rini , Simon Glass Subject: [PATCH 8/9] docker: Fix LegacyKeyValueFormat warning with PYTHONPATH Date: Mon, 4 Nov 2024 06:39:52 -0700 Message-Id: <20241104133954.840994-9-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241104133954.840994-1-sjg@chromium.org> References: <20241104133954.840994-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Fix a warning due to the syntax used for PYTHONPATH: LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 304) Signed-off-by: Simon Glass Reviewed-by: Tom Rini Reviewed-by: Heinrich Schuchardt --- tools/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index ae3d4685869..c42e0890897 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -301,4 +301,4 @@ RUN /bin/echo -e "\nx86 = i386" >> ~/.buildman; # Add mkbootimg tool RUN git clone https://android.googlesource.com/platform/system/tools/mkbootimg /home/uboot/mkbootimg -ENV PYTHONPATH "${PYTHONPATH}:/home/uboot/mkbootimg" +ENV PYTHONPATH="${PYTHONPATH}:/home/uboot/mkbootimg" From patchwork Mon Nov 4 13:39:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2006255 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=NOR06I99; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Xht0y0fJwz1xxN for ; Tue, 5 Nov 2024 00:41:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 255A58909B; Mon, 4 Nov 2024 14:40:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="NOR06I99"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CAF028909B; Mon, 4 Nov 2024 14:40:20 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd35.google.com (mail-io1-xd35.google.com [IPv6:2607:f8b0:4864:20::d35]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B94B088C7C for ; Mon, 4 Nov 2024 14:40:18 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd35.google.com with SMTP id ca18e2360f4ac-83abe4524ccso156687439f.1 for ; Mon, 04 Nov 2024 05:40:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730727617; x=1731332417; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vmwBZyjxTwrCXhBnxmI4WJ5bHwoqqqPAZonFjR4CMlk=; b=NOR06I99r7qNswBDNsT/O3NGHT+TyDQvyHTEkpTN4EKukvbDzYAc9U1drSru7AN/Xr EK1q0d8lH8OEtp/b6COc2P2PLqT3QI2+6gUVa+xhGFb+Q9dZJrpOGYeuTfY+FEJG9+19 buPj5VccWZco1qi2VtE654P0efllaax2wPCPc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730727617; x=1731332417; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vmwBZyjxTwrCXhBnxmI4WJ5bHwoqqqPAZonFjR4CMlk=; b=HVjl0qg4rkLE1zz/C9e0DN5Rc9HP/DPCNrK57m27JzuEgVqFLCL6OoNd7NoQtOgG2L V7+eAzpPsXvCD8lZ+a7jMZIvdN3VT5fLu2cWjFm5a23Oq9Jpo+MhTwmiEZDiFWu3SY6w slyT6V+2GZfEopLOnA/LeJFlOepiP9EA0Ypea2hE9L2OxxNjLRrD8FHN8oJi2tp/Z/xu xWQhKGfj3+4JyauDzve6SgqjheaYLus67rynNFTkf5BaJCdkZe+2DiZfCCmIAJdzGKs+ dbBUxkJy+wu19qWf7cC2biY4fPVV8WZbuJF1zUcgRVjrOUITDoVetj0Xqdw8Hy22wFmi MRmw== X-Gm-Message-State: AOJu0Yz9lBDS+Y+L0LDXGOcnqkRG3eoTFQYiptMwnUuQCwJUxlLZfu9J yeP5ax/bO/l8dVY/4qycu5ErHV5vK/dqcAY9b9EFup9JarswWUD4KXQEA8WGuJHSzGMg1xwLOT8 = X-Google-Smtp-Source: AGHT+IH9BNIKrxnBKyOP81Dvzs5CTEhz1DlJojSdxh+v4rUCD8FCz5FhnRdrTEsJOKUMDCEjjncxLg== X-Received: by 2002:a05:6602:2d87:b0:832:13ce:1fa3 with SMTP id ca18e2360f4ac-83b64faa3f4mr1760414739f.8.1730727616892; Mon, 04 Nov 2024 05:40:16 -0800 (PST) Received: from chromium.org (c-107-2-138-191.hsd1.co.comcast.net. [107.2.138.191]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4de048895f3sm1935128173.12.2024.11.04.05.40.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 05:40:15 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Heinrich Schuchardt , Tom Rini , Simon Glass , Ilias Apalodimas , Jerome Forissier , Jiaxun Yang , Patrick Rudolph , Raymond Mao , Sumit Garg Subject: [PATCH 9/9] CI: Add platform variable Date: Mon, 4 Nov 2024 06:39:53 -0700 Message-Id: <20241104133954.840994-10-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241104133954.840994-1-sjg@chromium.org> References: <20241104133954.840994-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Add a list of possible platforms that can be used by gitlab runners. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0aeda53bc2d..e152060b046 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,7 @@ variables: DEFAULT_TAG: "" MIRROR_DOCKER: docker.io + PLATFORM: linux/amd64,linux/arm64 default: tags: