From patchwork Tue Nov 5 16:07:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2006975 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=oMBa87ay; 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 4XjYCg31XBz1xxN for ; Wed, 6 Nov 2024 03:08:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7D328891D0; Tue, 5 Nov 2024 17:07:51 +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="oMBa87ay"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CD830891E3; Tue, 5 Nov 2024 17:07:50 +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-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) (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 A4CF3891CD for ; Tue, 5 Nov 2024 17:07:48 +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-xd36.google.com with SMTP id ca18e2360f4ac-83abcfb9f39so163847939f.1 for ; Tue, 05 Nov 2024 08:07:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730822867; x=1731427667; 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=gxNLJPq5Ka6j47wJ18Z438Fa+YENrT4AnJfiQVeRdUk=; b=oMBa87ay5aWVtcH1HEoEdsiAQlktjXuNrKxGTmobXNznAfRCZAvvGvgV90Tkl5stoz Rg8sjlqo18imAV43L29/ZaWKBv2J0yC+n63ZnxArrVIHuGUztrTapIyT/FBo3hKmUrZY AahetQiX2qetwyw592ev1TwaPRw/nmDtiB4Mk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730822867; x=1731427667; 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=gxNLJPq5Ka6j47wJ18Z438Fa+YENrT4AnJfiQVeRdUk=; b=AF0fh/XT2mjgFoElk7dBho+Jwie38VEQGknMTSejh5OfCR6NMP2iAH/Rteq9lPxMIV 5Lu02q1HTDU/IXxUimNO492IpQziELP16MJVOL8smHP8D8svfRR5keCIiECZ55jZZjQm 5foMvPjg5pfVLaaoJctiqnPbzK+2jMg6CF/sBuprs6HKJHCITCmNy2Jrr8uyCDASn6f5 yuZDbY/3tGYlvmy0P3mH3BnQNcDPlYtX5WylaI+wX0mg4IqC7RmTU+WPY+Zpjc+K/kN0 wXYHhGjUCbd5L0Tqb1/CkGyqaBh+5v3WoInnCwEXFXO7jQPY1nGm9yjltRV/IhGlgEGx RNTQ== X-Gm-Message-State: AOJu0Yyz7i9dobP3NZd9Ush6yNz4wmUMRfOTXsyAH/jLCSPEdMFuDRAt 59+l0+i+kcVNvte7QiZg5rWNBgkZ4ppebtNb3RMORPnx0acHZ4Muf0caDho6hAuzrcC6T2XIpGE = X-Google-Smtp-Source: AGHT+IG+nhSCpEgWpBu1quwhgBiexP+6qDD/KpdcdyQG2XtPhrIxtabcSToOu39OU52ZTlwDQXcgbQ== X-Received: by 2002:a05:6e02:ca5:b0:39f:5def:a23d with SMTP id e9e14a558f8ab-3a6afec7f93mr139622585ab.5.1730822866721; Tue, 05 Nov 2024 08:07:46 -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 e9e14a558f8ab-3a6a99ccbf5sm29640285ab.44.2024.11.05.08.07.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2024 08:07:45 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Heinrich Schuchardt , Simon Glass , Ilias Apalodimas , Marek Vasut Subject: [PATCH v2 1/9] sandbox: efi_loader: Correct use of addresses as pointers Date: Tue, 5 Nov 2024 09:07:30 -0700 Message-Id: <20241105160738.3795497-2-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241105160738.3795497-1-sjg@chromium.org> References: <20241105160738.3795497-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. Signed-off-by: Simon Glass Fixes: 3286d223fd7 ("sandbox: implement invalidate_icache_all()") --- Changes in v2: - Drop message about EFI_LOADER 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 Tue Nov 5 16:07:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2006976 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=OinJkiTd; 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 4XjYCr13Gsz1xxN for ; Wed, 6 Nov 2024 03:08:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CF45089215; Tue, 5 Nov 2024 17:07:54 +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="OinJkiTd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9843B89025; Tue, 5 Nov 2024 17:07:53 +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-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) (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 7F71D891D1 for ; Tue, 5 Nov 2024 17:07:51 +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-il1-x129.google.com with SMTP id e9e14a558f8ab-3a6c2077afcso9303995ab.0 for ; Tue, 05 Nov 2024 08:07:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730822870; x=1731427670; 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=vhp3gOtZbJskzNQ2TrUxO5tNQB3/XjjvaME5lVdwWG4=; b=OinJkiTdy+yQCZIbNNOX6M5drfqfc4k6mgGcBHQJjKxRV1ctHbBUpu5XFpuCX8HNo4 TNCNfFFuRjGyfaCIcQORl41Y3BSwfQQAmReOiiWkttkFzqq2WHWEtaBR7ziMTxAt5VJZ OInP2HMsBQc5lIOouunQoKitJ9LKLvdcr2h4U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730822870; x=1731427670; 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=vhp3gOtZbJskzNQ2TrUxO5tNQB3/XjjvaME5lVdwWG4=; b=N/mBEV8ZcXRx+7OhHTjf9Px3Hw/QFrM+yn8ZTS0QYtSIm2ZL7iKTDPzzSrCOAcinKM atJ8MfAInqvCxyAj9l/EQpzY5B7GITa0PdojmTMywI+Pe5jVtagPMQNw8VWbUjeReUmP 46ztdbvjH+ZlwKEJpH/HCrvszA+sCJpVzJ3oQQr9oKJZSppxmCoWxy+KC+e6eeblTHi0 jhNWrFez/9p9dIOawvzA6jaZKwnRVVFI3XCb9F5lg/MxL9wjOtUlZisW1Y2iPMdbS7ho 3CVJJ+chLq3kNPv4z9OcnQ0Us5i++Uu/z0SXlOZgnCGNK1Grf8SoTrHsrD2Xov0tJUn1 FxLQ== X-Gm-Message-State: AOJu0YziZVjcXRMODS7UkaRRD+LwA5CCvY9KZvg/G3Jx+Mwj5YQC1fh5 dH6wnOG98T/TcuZDLRxZk9yNxBOaNSoNVAJGbDSppcHXvVCmDsxqfTB1wyF4suYFnv2e7cd13XU = X-Google-Smtp-Source: AGHT+IFxwaVMGaoUepPFXNm4vd6NHLbQS21PWSjSc5nzkMsuAjozvSoqQkNARNQC4qIB4//zg5E5+w== X-Received: by 2002:a05:6e02:1fcc:b0:3a0:49da:8f6d with SMTP id e9e14a558f8ab-3a4ed3057c0mr354443665ab.22.1730822869533; Tue, 05 Nov 2024 08:07:49 -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 e9e14a558f8ab-3a6a99ccbf5sm29640285ab.44.2024.11.05.08.07.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2024 08:07:48 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Heinrich Schuchardt , Simon Glass , Ilias Apalodimas , Mattijs Korpershoek , Raymond Mao Subject: [PATCH v2 2/9] test: Adjust print_ut test to use unsigned char Date: Tue, 5 Nov 2024 09:07:31 -0700 Message-Id: <20241105160738.3795497-3-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241105160738.3795497-1-sjg@chromium.org> References: <20241105160738.3795497-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. Update the terminator-assert to use a character instead of a byte. Signed-off-by: Simon Glass Reviewed-by: Heinrich Schuchardt --- Changes in v2: - Use '\0' instead of 0 test/print_ut.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/print_ut.c b/test/print_ut.c index f5e607b21a3..7ab79e4617f 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('\0', linebuf[75]); + ut_asserteq(0xff, linebuf[76]); unmap_sysmem(buf); From patchwork Tue Nov 5 16:07:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2006977 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=K7snE2/H; 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 4XjYD14dJpz1xxN for ; Wed, 6 Nov 2024 03:08:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 33DF3891F4; Tue, 5 Nov 2024 17:08:00 +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="K7snE2/H"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6087089025; Tue, 5 Nov 2024 17:07:58 +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-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (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 62DD089208 for ; Tue, 5 Nov 2024 17:07:54 +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-il1-x12e.google.com with SMTP id e9e14a558f8ab-3a6bdc8f7a1so12880215ab.1 for ; Tue, 05 Nov 2024 08:07:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730822872; x=1731427672; 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=tPX6yYyZLcHsMVj8Ozg6h7kidfyRQc+RW5rBPIXA9C8=; b=K7snE2/HnOU/b3kh/JTB9f8UUTKXQMANqUWxXKYSVma5JeAaUaFg7V45kA2YNfzoUP JsLE7df4uSV0xae7ef2bdhN5uXeU36hHxOqs2KlLLtFr55lRO8jXpa8GGa9RJYFmdbIv h0SCHmECNsxMW8Mgz9HBq/Z/kIF+83XDTXbiA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730822872; x=1731427672; 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=tPX6yYyZLcHsMVj8Ozg6h7kidfyRQc+RW5rBPIXA9C8=; b=oHg4NDqjpf/ybxCo77KnpIHWSAjCKhYli9nJEpDxey8wJTZ0wIpketMofRXhZ5dHMX jrFmnAZ/sLsb04h25N4n63sd6nKpuOluyind4kXkyaHNaOnHR4KhwoD+B/GNU+0DXuVh E9oyDq6VGzPggN7iD5F9MsJm7DZPi0CmLCqzHpN/mS3GvYil75TYVowYEu1CGvD6AIPX Rz4i700B7MVEqa1UKxkuPBhCTtYvPpbRyDZHieHa5fNPxq38M4jK23yRO7m/jYbfQ2yA qdXTZxHfAVYmt5/hwUiPO1uhfYylO014kmp+OTCVZAM6s/vR5xKWhbIzbPimSOwzZ92/ d9DQ== X-Gm-Message-State: AOJu0Yy5UX8w7hLiiuaKyI828RVU1hRXE7ayKuY4LyXDWcHuBFASdgJp SURNg4g505TLU1SUoXPVEd18CI6Xp3NhmN3HSYbBgliVmtwcqx+ybX6EG3i9ItA4oKQICD9WEYY = X-Google-Smtp-Source: AGHT+IF5o9AuBnxaWys65VpPpxbebm5a8oxa7LxpeRX0+zQHpVk/yzUWXUmogVz09/FPwes1PJCDpg== X-Received: by 2002:a05:6e02:152:b0:3a6:ac4e:2659 with SMTP id e9e14a558f8ab-3a6ac4e280dmr134037805ab.6.1730822872313; Tue, 05 Nov 2024 08:07:52 -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 e9e14a558f8ab-3a6a99ccbf5sm29640285ab.44.2024.11.05.08.07.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2024 08:07:50 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Heinrich Schuchardt , Simon Glass , Mattijs Korpershoek Subject: [PATCH v2 3/9] docker: Support building for multiple architectures Date: Tue, 5 Nov 2024 09:07:32 -0700 Message-Id: <20241105160738.3795497-4-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241105160738.3795497-1-sjg@chromium.org> References: <20241105160738.3795497-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. Update the documentation as well. Drop the 'sudo' since these should not be needed if Docker is correctly configured. Signed-off-by: Simon Glass --- Changes in v2: - Update docs also - Add comments to the ARG variables doc/build/docker.rst | 16 +++++++++++++--- tools/docker/Dockerfile | 12 ++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/doc/build/docker.rst b/doc/build/docker.rst index 45659b3b89d..b854fad43a9 100644 --- a/doc/build/docker.rst +++ b/doc/build/docker.rst @@ -1,14 +1,24 @@ GitLab CI / U-Boot runner container =================================== -In order to have a reproducible and portable build environment for CI we use a container for building in. This means that developers can also reproduce the CI environment, to a large degree at least, locally. This file is located in the tools/docker directory. To build the image yourself +In order to have a reproducible and portable build environment for CI we use a container for building in. This means that developers can also reproduce the CI environment, to a large degree at least, locally. This file is located in the tools/docker directory. + +The docker image supports both amd64 and arm64. Ensure that the +'docker-buildx' Debian package is installed (or the equivalent on another +distribution). + +Building is currently only supports on an amd64 machine (i.e. 64-bit x86). While +both amd64 and arm64 happen in parallel, the arm64 part will take considerably +longer as it must use QEMU to emulate the arm64 code. + +To build the image yourself:: .. code-block:: bash - sudo docker build -t your-namespace:your-tag . + docker buildx build --platform linux/arm64/v8,linux/amd64 -t your-namespace:your-tag . Or to use an existing container .. code-block:: bash - sudo docker pull trini/u-boot-gitlab-ci-runner:jammy-20240227-14Mar2024 + docker pull trini/u-boot-gitlab-ci-runner:jammy-20240227-14Mar2024 diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 967ac89fbde..540718df062 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,15 @@ LABEL org.opencontainers.image.description=" This image is for building U-Boot i # Make sure apt is happy ENV DEBIAN_FRONTEND=noninteractive +# Used by docker to set the target platform: valid values are linux/arm64/v8 +# and linux/amd64 +ARG TARGETPLATFORM + +# Used by docker to set the build platform: the only valid value is linux/amd64 +ARG BUILDPLATFORM + +RUN echo "Building on $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 Tue Nov 5 16:07:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2006978 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=QWAN5wkI; 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 4XjYDB6R40z1xxN for ; Wed, 6 Nov 2024 03:08:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 829E1891D1; Tue, 5 Nov 2024 17:08: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=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="QWAN5wkI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E76968917B; Tue, 5 Nov 2024 17:08:03 +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-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) (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 0B3E8891D2 for ; Tue, 5 Nov 2024 17:07:57 +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-xd30.google.com with SMTP id ca18e2360f4ac-8377fd760b0so208075639f.2 for ; Tue, 05 Nov 2024 08:07:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730822875; x=1731427675; 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=y2O+2Vb3tgSO1VPiEWlpJ5/OzhTXqtiuniFf7esntAU=; b=QWAN5wkIE63ymayODbzgWrH46ESgVNseT0XqiSdQyo0HKuNJwj6OUJyZJ9qDR2CCAb u33c0VdLpBvDwtJ8rTs05pToy1pk3cHimC/f77jbGibpuho05f8ouWu5b5v5sqv+26YG T4uj3D8hDsoLfiF/Axh4WuQZuvoRXhgN/Yn70= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730822875; x=1731427675; 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=y2O+2Vb3tgSO1VPiEWlpJ5/OzhTXqtiuniFf7esntAU=; b=XXwE9bQ6dXYKv+j/Qh/K05YyCeU0lrQlgGdNuSngTPZmS3hLFLaLYt1Iif2WZ1sUqE TgYVzca7yPC2uUy2eoYdcvF1lLnue7ZDk4MZLGA+VPy4KoWeq2k2mwLoVe6jxGIgdMO8 5WwIFf/LRl7d2fz+nad3E3/jxZbkj+fDzlhfAqXBM6Az5JFNsObRqG1lsYFXrTAlF0Jo Q4JKTeB7FioS/jX9/azKnYoa1pnQJTwR7HlJiyZpPqF1qLaOq8+DlROizikhv0ELi+ba ni1mNOCLmpqs1YwT6Y7E6nLzq2DHJpq70pxS8HFuQXeWYqeIRAxnhBq1638WR+dktTBF NkDQ== X-Gm-Message-State: AOJu0Yze2lTJPvoLI4uln2un4q4/zje0kW5dmXSpYcXLn0uItZ3Z5FWG RySKJpxmS26hzlelup1Si62YZSLFYe/XAhF0gY7zhGyYKQFKo5Xa52cwS38InG2HlJgcRqHnduc = X-Google-Smtp-Source: AGHT+IEy13McK8jjsddbO0SZ15VZRo+tlvVRR7YS1XjwX+3hqHr5Jnpuj1hYb/ym3jHX2/u3xP90hA== X-Received: by 2002:a92:c246:0:b0:3a0:8d2f:2914 with SMTP id e9e14a558f8ab-3a4ed2fe5f9mr369393595ab.23.1730822875019; Tue, 05 Nov 2024 08:07:55 -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 e9e14a558f8ab-3a6a99ccbf5sm29640285ab.44.2024.11.05.08.07.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2024 08:07:53 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Heinrich Schuchardt , Simon Glass Subject: [PATCH v2 4/9] docker: Adjust packages for arm64 Date: Tue, 5 Nov 2024 09:07:33 -0700 Message-Id: <20241105160738.3795497-5-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241105160738.3795497-1-sjg@chromium.org> References: <20241105160738.3795497-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 --- Changes in v2: - Swap order so that amd64 is the exception tools/docker/Dockerfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 540718df062..84661b036c6 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -44,7 +44,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/amd64" ]; then \ + EXTRA_PACKAGES="grub-efi-amd64-bin grub-efi-ia32-bin libc6-i386 linux-image-kvm"; \ + else \ + EXTRA_PACKAGES="grub-efi linux-image-generic"; \ + fi; \ + apt-get update && apt-get install -y \ automake \ autopoint \ bc \ @@ -70,13 +75,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 \ @@ -94,7 +96,6 @@ RUN apt-get update && apt-get install -y \ libtool \ libudev-dev \ libusb-1.0-0-dev \ - linux-image-kvm \ lzma-alone \ lzop \ mount \ @@ -131,6 +132,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 Tue Nov 5 16:07:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2006980 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=n/fMuMbh; 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 4XjYDX2CPtz1xxN for ; Wed, 6 Nov 2024 03:09:00 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 23DAA8920C; Tue, 5 Nov 2024 17:08: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=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="n/fMuMbh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1BEB589229; Tue, 5 Nov 2024 17:08: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-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) (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 9871189025 for ; Tue, 5 Nov 2024 17:07:58 +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-il1-x129.google.com with SMTP id e9e14a558f8ab-3a3a5cd2a3bso20404745ab.3 for ; Tue, 05 Nov 2024 08:07:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730822877; x=1731427677; 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=wkNTjj60QJ2JRF0Jw3a3akU43lIOn1QanNvErTDtkkE=; b=n/fMuMbhh4LcSFjrPYdXB3KMv5bIl+8a2cBxD/JjZ9G9NqIvbJLa0O3xq0+JKm74QH Dokm/LqGNo0KSCzVO8dkPH4Kc9hHb9A3QVvtnsWvspWbFO+53LgOYhOSZXm3Nq+rW0Aa Jzpgrr5jehZBJT4PQS6I1bmeCxbb2d7IEFAY4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730822877; x=1731427677; 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=wkNTjj60QJ2JRF0Jw3a3akU43lIOn1QanNvErTDtkkE=; b=eUeEb64oOXCQlgVATlzkjztuh6jfbVX1K5N7QeGDi6ZBnowbjDOSZ3CdleTJJf2XEA AK/YhqdvRZTciMF34/8UmExLySyel9uryomCqRgC/8lYOcB50BVRAyZ0/E9QkZ3ng3sW 0yGW1jzsAaBbYVtjf5iMeoK1EQQxjDy6s5UYdKawOaITLyK2oeF6DPpIcz8We+nwFISh de4N7Dxnl6XwJswtLhwallssbn1gmoecQe1+jhI8/deicMShhXFYC3Ikt+OXD0QJ256L IFUJbiyC7eFqjgVs3Gi9hQkEakHlxSh9loRIgX2QA0NVd70mZF1CnKrpKMIlcHLcnqtf NbSA== X-Gm-Message-State: AOJu0YzeqFkl+Kb6VKJSSVf3WdkIbltAVBBvhLrx4MhK3kByjvfZgXIs Fhl+o3GHV62E5gPtm6lODipVV2WAWlGlXBwIINNxnjNe5ROwbAoMPcMlV695+SWiGyYhLu7Q8jg = X-Google-Smtp-Source: AGHT+IFLqLz4FUHYjK80Dwz+4ZRQEdRcMNlxgtac75B2J1/3MbQlkTT87n0avJRhArZZieHLgSue3A== X-Received: by 2002:a05:6e02:52e:b0:3a5:e3bc:c1bf with SMTP id e9e14a558f8ab-3a5e3bcc3ddmr202895905ab.23.1730822876813; Tue, 05 Nov 2024 08:07:56 -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 e9e14a558f8ab-3a6a99ccbf5sm29640285ab.44.2024.11.05.08.07.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2024 08:07:55 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Heinrich Schuchardt , Simon Glass Subject: [PATCH v2 5/9] docker: Drop grub for arm64 Date: Tue, 5 Nov 2024 09:07:34 -0700 Message-Id: <20241105160738.3795497-6-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241105160738.3795497-1-sjg@chromium.org> References: <20241105160738.3795497-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. The error seems to be due to not using the correct toolchains: ./configure: line 32517: /opt/gcc-13.2.0-nolibc/aarch64-linux/ bin/aarch64-linux-gcc: No such file or directory checking for options to get soft-float... no configure: error: could not force soft-float That is at the top of the file, and needs adjusting. Signed-off-by: Simon Glass --- Changes in v2: - Expand commit-message to show the problem tools/docker/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 84661b036c6..458deb7c1ad 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -139,7 +139,9 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; 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" && \ @@ -189,7 +191,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 Tue Nov 5 16:07:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2006979 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=FAkGkT/T; 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 4XjYDN0Ygkz1xxN for ; Wed, 6 Nov 2024 03:08:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0866A89229; Tue, 5 Nov 2024 17:08: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="FAkGkT/T"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0B2C98920C; Tue, 5 Nov 2024 17:08:05 +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-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (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 9853789204 for ; Tue, 5 Nov 2024 17:08:01 +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-il1-x131.google.com with SMTP id e9e14a558f8ab-3a3b4663e40so19268145ab.2 for ; Tue, 05 Nov 2024 08:08:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730822880; x=1731427680; 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=RjZ6cQPmMEZJKMHvvuvAJX3UCCnjOXWIF0uLFIEhf+4=; b=FAkGkT/TPIICiOx85GLPs+sQZOVEfZ8QHTlucgrxDe47NrMHzHxxLBNaPDTosy99AT bA9JZTFiy14j39j/ww2tObyMaXqHglW6iiXQCI1VPwZT7T4S2NIHNkv6DzS22RpnHRoY 1MGHZAUWDkFZDJPHWzeChlIsxWEta+LGkw8C4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730822880; x=1731427680; 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=RjZ6cQPmMEZJKMHvvuvAJX3UCCnjOXWIF0uLFIEhf+4=; b=eW0MO4tbT3uoHd+XJtla21hX/+gkOi4g2I7LfQqCJRoFrv4r5NBevXz8sZVbkh0JJN DSTl6Db1cJDJ16GigpeMMaWPX5lWPMZQq+9CR+Pd9X1VzSzd2khzM9Dn8W0TqnxALEPa 8PhUxFlXasjyxXcON1w1HNwK1a7WcP+bX8ipg5LOwHoZmy6x0NNdM+CnynqYP3wFuqcx xbw+dPEFkCwZhgMUTiHdqzL3ds07z2ZhkYOiIpo1zAg5YkUDGF3RZxgxd5hXO+HKHExT NfQZ6MaqXEEwX9M4sQK7wI2/5WOMt8gNd8r1ihnyX/5jSXZmHfovm3uhxx8Q2Ob9Y2Ct DGeQ== X-Gm-Message-State: AOJu0YzjqQraSCL11E0qP5lstalvB4cVLcgBLxpZBnn5uTM+gdutygvZ mZr808l2k4qHOMxYzjxaN1hokgxuSZFpht6A7SAgR4kBEqhP3KXA4qL2hYqEI4uJhEoV58NWyyg = X-Google-Smtp-Source: AGHT+IGqc6o2bl/VQ0BA0OZoiMZ9mdwwUhLuBddXZgOR+vxSNQh/OkrU+ERApjY2ZEIqjWPOKqJtBA== X-Received: by 2002:a05:6e02:1a8c:b0:39d:2939:3076 with SMTP id e9e14a558f8ab-3a6b0394ec1mr147026875ab.25.1730822879566; Tue, 05 Nov 2024 08:07:59 -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 e9e14a558f8ab-3a6a99ccbf5sm29640285ab.44.2024.11.05.08.07.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2024 08:07:58 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Heinrich Schuchardt , Simon Glass Subject: [PATCH v2 6/9] docker: Drop tracing for arm64 Date: Tue, 5 Nov 2024 09:07:35 -0700 Message-Id: <20241105160738.3795497-7-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241105160738.3795497-1-sjg@chromium.org> References: <20241105160738.3795497-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. The error is: /usr/bin/ld: /usr/local/lib64/libtracefs.so: undefined reference to `trace_seq_vprintf' Signed-off-by: Simon Glass --- (no changes since v1) tools/docker/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 458deb7c1ad..43b789a0c3e 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -245,7 +245,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) && \ @@ -258,7 +259,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 Tue Nov 5 16:07:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2006981 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=cdjmPYnD; 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 4XjYDj3FwMz1xxN for ; Wed, 6 Nov 2024 03:09:09 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 83C7989208; Tue, 5 Nov 2024 17:08: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="cdjmPYnD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3EF988922E; Tue, 5 Nov 2024 17:08:07 +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-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) (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 C3D62891E1 for ; Tue, 5 Nov 2024 17:08: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-il1-x133.google.com with SMTP id e9e14a558f8ab-3a6ace3b6a5so15828335ab.1 for ; Tue, 05 Nov 2024 08:08:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730822882; x=1731427682; 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=bDv15Aaz2v8zK9iJghSX+hz9AVu1qO9MlbVbe1GPKuY=; b=cdjmPYnDN75odA6CvWOwniy+wvAreZz/Q2Ek4CnEOVuEQI+i7eNGK8K3EOkbW/DGMF fmDdffNQco+kxmiKspnPCvJv/0D+UA1RkLa0a8hM+Xsz4rsQ5KVPFIj+4yWGPWHt617l mOLzXh9pa6KIIIWwN4YOIBI76U5VHgr56ey8U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730822882; x=1731427682; 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=bDv15Aaz2v8zK9iJghSX+hz9AVu1qO9MlbVbe1GPKuY=; b=SYOmgVLjgw53wczPFh+08vbstS3967QHS6lWpeQG0ihGIiye79xe+h22AqKZak8Qsb MTobIsYV+A8i+G1Xohdi9uFajBolrSNFAgRRTDQ9ozVsN0rr2elWZI4xQPc9lghhBic1 zIuvkCQmgdh/6XKUMnFiqtiXSwyB0XN6jpLUAM+pUdWPpaxPOBgkIMJnCYN0/pYXvCgM 5WbGeMbjzVSFCZ0FfrXA2gN0o2oSjp7LH7ZEB2f4yYZpC2IpUpNU21PU241dY/6RH2IX /IoZJ/7yzzOUDwjwBRlpOFZ/ubYu/aVCmBPzkwrMeDaZEgRZNs8u38WvEhNyh8m7vHff eJZQ== X-Gm-Message-State: AOJu0Yy5vOkU2UbS+12Uj5IoKxKla4Jt9WX74i+n8d6TKWA9v4wIbJ7+ Gq6n6NNdG/a6FhNeI9jDUE5Jvhbz6AsHTZPnOWP1ys3olzadz3pmXCrcBuJjnECP5aQoFUwvpJo = X-Google-Smtp-Source: AGHT+IG7wDEf8GW2Nbbzu7axobFPb1MFVNVwR46iPFMozP1ydohe/FMZVvPafWIvBZsoXBaUuWQYbQ== X-Received: by 2002:a05:6e02:1ca3:b0:3a6:c439:6812 with SMTP id e9e14a558f8ab-3a6c4396b51mr96608035ab.16.1730822882377; Tue, 05 Nov 2024 08:08: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 e9e14a558f8ab-3a6a99ccbf5sm29640285ab.44.2024.11.05.08.07.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2024 08:08:00 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Heinrich Schuchardt , Simon Glass Subject: [PATCH v2 7/9] docker: Drop coreboot for arm64 Date: Tue, 5 Nov 2024 09:07:36 -0700 Message-Id: <20241105160738.3795497-8-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241105160738.3795497-1-sjg@chromium.org> References: <20241105160738.3795497-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 --- (no changes since v1) tools/docker/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 43b789a0c3e..9eda6d8d402 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -263,7 +263,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 && \ @@ -274,7 +275,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 Tue Nov 5 16:07:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2006982 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=e9Q+oVWY; 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 4XjYDt3nrtz1xxN for ; Wed, 6 Nov 2024 03:09:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D82988922D; Tue, 5 Nov 2024 17:08: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=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="e9Q+oVWY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 518338920A; Tue, 5 Nov 2024 17:08:10 +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-il1-x12f.google.com (mail-il1-x12f.google.com [IPv6:2607:f8b0:4864:20::12f]) (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 2A65A8922D for ; Tue, 5 Nov 2024 17:08: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=sjg@chromium.org Received: by mail-il1-x12f.google.com with SMTP id e9e14a558f8ab-3a6be369d23so12057185ab.2 for ; Tue, 05 Nov 2024 08:08:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730822885; x=1731427685; 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=8g4tS4PXCcMosjAgerRQEdNgX+TFlFVHSNmSM9TuiV4=; b=e9Q+oVWYoXVEXb7ELiAS6dgiooRzi2zfvr7zEZ5A09TEw5noaiu+MwOTCmynDs+axr ATd+MS8lKANnPGU+YbM+Jw0OqqZP3AjQmuuCZ4uk9MBmXQ0uuJhqfhGk5F6eLqL2/dt0 uJ+u/SnSdPq/1G3vmwAfh9sN0JXMjMvxE53S0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730822885; x=1731427685; 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=8g4tS4PXCcMosjAgerRQEdNgX+TFlFVHSNmSM9TuiV4=; b=lkumtdQfJfaxSf0PKtMMIwBUndMO6wyMfpFOoADXaXaB6wvMWWXXM69iscAh6V6YwD S4nknBSEFEGlu07XbEczWVWqqL9wf9qtOWW1mh/oiid9WRbKa/D8aU0BIn3tFLgB46kM 4rQckvQxx2raY0v1WL/fzgilpdcOUSIOusJXCiL4sIspgFYc9l4szbCve7XISIDpLCv+ IphqY0aTkCKiqVjEINviagkYjazGOGnk41Ow9xo+P+JNwuyLeCty4j6sVWkwd1Xe4kvX tCXITtJJrp0NRAbf5+FdIKdjBmQIbInAXAJzefY0/UMds38HIOb6swsZESN97ljITsI9 eL/g== X-Gm-Message-State: AOJu0Yz3aY82SshDSoWvIag3L5foTf6WVbD08TMlwCSCXo+3bLcgzota WzUsgsbJnJIFUTs5kXKbYvwp5yHHT1DIsN701M4nzytUzKoEKXm+qr3jUgjfh77Ghp558u8jS28 = X-Google-Smtp-Source: AGHT+IE4ADYvEc07FR0w+Afo/1uR0Qqwn2sjNkVyIbW+td/fcvXLFoWWNFXTS0YTuIZO6G9G9zpKkA== X-Received: by 2002:a92:c26f:0:b0:3a3:9471:8967 with SMTP id e9e14a558f8ab-3a60f219a0emr200897305ab.11.1730822885189; Tue, 05 Nov 2024 08:08:05 -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 e9e14a558f8ab-3a6a99ccbf5sm29640285ab.44.2024.11.05.08.08.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2024 08:08:03 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Heinrich Schuchardt , Simon Glass Subject: [PATCH v2 8/9] docker: Fix LegacyKeyValueFormat warning with PYTHONPATH Date: Tue, 5 Nov 2024 09:07:37 -0700 Message-Id: <20241105160738.3795497-9-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241105160738.3795497-1-sjg@chromium.org> References: <20241105160738.3795497-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: Heinrich Schuchardt Reviewed-by: Tom Rini --- (no changes since v1) tools/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 9eda6d8d402..72844d2c50b 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -306,4 +306,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 Tue Nov 5 16:07:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2006983 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=RljTlxxB; 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 4XjYF33dkcz1xxN for ; Wed, 6 Nov 2024 03:09:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4BECA891EA; Tue, 5 Nov 2024 17:08: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=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="RljTlxxB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E8C0B89232; Tue, 5 Nov 2024 17:08: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-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (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 D489389025 for ; Tue, 5 Nov 2024 17:08:09 +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-il1-x12c.google.com with SMTP id e9e14a558f8ab-3a4e5a7b026so19805675ab.3 for ; Tue, 05 Nov 2024 08:08:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730822888; x=1731427688; 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=CWmhibPxKBzf7aRs2ImAjQZgqb5Gc72CGPfvOObhEdA=; b=RljTlxxBOZv2LM+QxS9WRas0w+uP8DmfKbAX1ra+GI8L9NcQqBbw87JEBB9ZEn95mU yyoLKgh3IdYy9kUCbJ5CchMPeSG9CgEDdm2+cc6xMv5dJaLpW9ZaeIEwRhgEMpb+M7W6 NkyirG0BmtQZALR0n/MnZWLyld8AmTsfN7ngU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730822888; x=1731427688; 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=CWmhibPxKBzf7aRs2ImAjQZgqb5Gc72CGPfvOObhEdA=; b=MNzm3c2N6ngUftX6xEckb2AR/YL0IdWc06Ph5DrOk8uFMPTu7d1xQRFq/BncmiMF4z Vp0tDlIYM+7w2FP7+Z1dGURlDj92MJdCdj0QCcjEMvac7J2ONa16/+sdJmd8Pg1VyZ3d itAl8saQDrnXYZJ9e4LlhcgSvy0QaJGWW8zFSvLR4Y6XRsx8Z8uUxYLNLnKWDt86K774 lWAysAIwSvskoNxPgs+UocW9PtEjHDuGLkuwKebyn8uNqoRLcXUS2CltF6Zw5mevSJnV qJxSZeAWdngumddkKujmP/sHCSaBOJWzAhJ4Rr5Kb+z7JzNL9T8rDVG+JntfiUOePWuZ YGZw== X-Gm-Message-State: AOJu0YyPl0al6xaz0s8CgqfaahVTX1QDyG1Mu9lr67xoBGY7ZAtMFZLw ELQtXpUSlGMED1oJOpF038ThbLVcUHE1a1hbnPL1jrA288il0Gi1OzIw12CZuFdmG7ZUb95IuaE = X-Google-Smtp-Source: AGHT+IHYbZ7UndEoQOvXiOv9q4Qf8ZOegoDNA9iYMK/dIhhWHfLrve/Z9dh3fCMhn0jIhgu7AlicXA== X-Received: by 2002:a05:6e02:168c:b0:3a6:c43d:12ff with SMTP id e9e14a558f8ab-3a6c43d15bcmr89582765ab.8.1730822888065; Tue, 05 Nov 2024 08:08: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 e9e14a558f8ab-3a6a99ccbf5sm29640285ab.44.2024.11.05.08.08.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2024 08:08:06 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Heinrich Schuchardt , Simon Glass , Ilias Apalodimas , Jerome Forissier , Jiaxun Yang , Patrick Rudolph , Raymond Mao , Sumit Garg Subject: [PATCH v2 9/9] CI: Add platform variable Date: Tue, 5 Nov 2024 09:07:38 -0700 Message-Id: <20241105160738.3795497-10-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241105160738.3795497-1-sjg@chromium.org> References: <20241105160738.3795497-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 --- (no changes since v1) .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: