From patchwork Fri Jul 14 00:37:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1807477 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; 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=mAVxmRos; dkim-atps=neutral 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R2CHn6Lcxz20bt for ; Fri, 14 Jul 2023 10:37:56 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8593886C03; Fri, 14 Jul 2023 02:37:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com 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=konsulko.com header.i=@konsulko.com header.b="mAVxmRos"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 886CE86B35; Fri, 14 Jul 2023 02:37:42 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-yw1-x112a.google.com (mail-yw1-x112a.google.com [IPv6:2607:f8b0:4864:20::112a]) (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 4A02C86C03 for ; Fri, 14 Jul 2023 02:37:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yw1-x112a.google.com with SMTP id 00721157ae682-579ef51428eso12506807b3.2 for ; Thu, 13 Jul 2023 17:37:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1689295058; x=1691887058; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=FT9VKh9hBZikkU1Q9IUkGE6ZIJxqQL4SPY/IK4+xo3g=; b=mAVxmRosxJp+1yCIPdwmJDf/bA8hamJ+GM0A5uOfqzVuLsaxszOMHS/iXMCNlAymRJ StPq64zgj6OH/pf4VoPyfvbxXryM5skM5PYwAAKuleyUSAhdiBbZiejw6J8EVk6bEkhX OqcvE/F/SfqR83dcNA6epTUydQLHEp30coKFk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689295058; x=1691887058; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=FT9VKh9hBZikkU1Q9IUkGE6ZIJxqQL4SPY/IK4+xo3g=; b=kX0zfumeYccnWaQLHlTvktUa34LU3QoQG72Z4Fh1XGURFWPzucz4Kh3myIZa1S12XE t5BhobKfUysGUYQNGXywK77LcaCewu5ySOb7zI7S40HeqF7lbR47bEzZ16eCExXZ8qUX fbRA0msD/dp/qAld9m1dtJscAZWMTe56nPETYtuAXRgVlQiwsE+W1sfZOZXG+xWVko+j 6hegR2Cldim1z+5ZWt9kNCjCMDCsZYDqhz4imiYMjJgKe5xyCjkeD4Chb/eI1Z6wajXY 6bmvxE5KUMXzmIjt2mEkjcosl+GycBUTPFGFX43TcN5hn1gQUO7Ea/q5nSzFMaIHdUfJ D25g== X-Gm-Message-State: ABy/qLYYTm3VLSqCHpnBc+QfuQXfMLWWe8x/InLQTd9SevpKB0KyYlRf EafwyRcv3oeiuk/AVk36QswEf7gkFytnUfqd3LEp7g== X-Google-Smtp-Source: APBJJlEH4rW7H5Fi7avzRjzMf/etg1ZKWgH1u4cbMaTMHQ/Fjk8eiEP3vUs8Z3k+/h61bapSmmOCCg== X-Received: by 2002:a81:7b8a:0:b0:577:31f5:6793 with SMTP id w132-20020a817b8a000000b0057731f56793mr3150779ywc.45.1689295057830; Thu, 13 Jul 2023 17:37:37 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-cb70-e592-de93-e6d2.res6.spectrum.com. [2603:6081:7b00:6400:cb70:e592:de93:e6d2]) by smtp.gmail.com with ESMTPSA id y7-20020a0dd607000000b005616d72f435sm2036552ywd.116.2023.07.13.17.37.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jul 2023 17:37:37 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Aaron Williams , Stefan Roese Subject: [PATCH 1/5] mips: octeon: Correct types in cvmx-pko3-queue Date: Thu, 13 Jul 2023 20:37:32 -0400 Message-Id: <20230714003736.3512509-1-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 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 When building with gcc-13.1 we see that the prototype for cvmx_pko3_sq_config_children does not match the declaration. Make these match and correct a typo in the function's version of the docs that the prototype did not have, as part of keeping those in-sync. Signed-off-by: Tom Rini --- Cc: Aaron Williams Cc: Stefan Roese --- arch/mips/mach-octeon/cvmx-pko3-queue.c | 2 +- .../mips/mach-octeon/include/mach/cvmx-pko3-queue.h | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/arch/mips/mach-octeon/cvmx-pko3-queue.c b/arch/mips/mach-octeon/cvmx-pko3-queue.c index e28afdf8dd9d..53f2e4dd1861 100644 --- a/arch/mips/mach-octeon/cvmx-pko3-queue.c +++ b/arch/mips/mach-octeon/cvmx-pko3-queue.c @@ -761,7 +761,7 @@ int cvmx_pko3_pq_config(unsigned int node, unsigned int mac_num, * The Scheduler Queues in Levels 3 to 5 and Descriptor Queues are * configured one-to-one or many-to-one to a single parent Scheduler * Queues. The level of the parent SQ is specified in an argument, - * as well as the number of childer to attach to the specific parent. + * as well as the number of children to attach to the specific parent. * The children can have fair round-robin or priority-based scheduling * when multiple children are assigned a single parent. * diff --git a/arch/mips/mach-octeon/include/mach/cvmx-pko3-queue.h b/arch/mips/mach-octeon/include/mach/cvmx-pko3-queue.h index b3f61d75f225..3931191fe20f 100644 --- a/arch/mips/mach-octeon/include/mach/cvmx-pko3-queue.h +++ b/arch/mips/mach-octeon/include/mach/cvmx-pko3-queue.h @@ -6,6 +6,8 @@ #ifndef __CVMX_PKO3_QUEUE_H__ #define __CVMX_PKO3_QUEUE_H__ +enum cvmx_pko3_level_e; + /** * @INTERNAL * @@ -46,11 +48,10 @@ int cvmx_pko3_get_port_queue(int xiface, int index); * The children can have fair round-robin or priority-based scheduling * when multiple children are assigned a single parent. * - * @param node is the OCI node location for the queues to be configured - * @param parent_level is the level of the parent queue, 2 to 5. + * @param node on which to operate + * @param child_level is the level of the child queue * @param parent_queue is the number of the parent Scheduler Queue * @param child_base is the number of the first child SQ or DQ to assign to - * @param parent * @param child_count is the number of consecutive children to assign * @param stat_prio_count is the priority setting for the children L2 SQs * @@ -65,8 +66,10 @@ int cvmx_pko3_get_port_queue(int xiface, int index); * * Note: this function supports the configuration of node-local unit. */ -int cvmx_pko3_sq_config_children(unsigned int node, unsigned int parent_level, - unsigned int parent_queue, unsigned int child_base, +int cvmx_pko3_sq_config_children(unsigned int node, + enum cvmx_pko3_level_e child_level, + unsigned int parent_queue, + unsigned int child_base, unsigned int child_count, int stat_prio_count); /* From patchwork Fri Jul 14 00:37:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1807478 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; 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=SxBgQLOr; dkim-atps=neutral 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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R2CJ01hhNz20bt for ; Fri, 14 Jul 2023 10:38:08 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 874D986C53; Fri, 14 Jul 2023 02:37:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com 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=konsulko.com header.i=@konsulko.com header.b="SxBgQLOr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CF37A86CE1; Fri, 14 Jul 2023 02:37:47 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-yb1-xb2b.google.com (mail-yb1-xb2b.google.com [IPv6:2607:f8b0:4864:20::b2b]) (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 ED3F386C16 for ; Fri, 14 Jul 2023 02:37:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yb1-xb2b.google.com with SMTP id 3f1490d57ef6-c4cb4919bb9so1273815276.3 for ; Thu, 13 Jul 2023 17:37:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1689295058; x=1691887058; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=4dVqeIeTUijAdRYfi5LsEDa9GU772lo0CF3KR+r7WFc=; b=SxBgQLOrcZu5XOYszJuMDYL1OXx/+qACL3u68YyiBXG+ubJkDztK4tAam2A88Ltcda HycBb4+JFCzDwKe+SQx4EU7S6n7UVqZEGzssYZQaV7QjneEVEdQ1+Z7vFmRO6wuCvPy0 i9pGRsHpg4x0dn6RhxZlV8W9jB7nBbEP92rfo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689295058; x=1691887058; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4dVqeIeTUijAdRYfi5LsEDa9GU772lo0CF3KR+r7WFc=; b=g9UyYeVUn00282sRXNcI8DO9LAS9DJSwR6QQJLSKqpWPSjiHgoQghz6UueUgZ9peBC uJc4nA98h7pQ6UtDHiY+4R26X0W37F67VuusNL+BifM61lHgEbjaQLc1an+o4pauYRzb s56HWIbZ2HoIGrhxh99GAQ9k0sECItVXpMHVOTpweT/Q1r0/f65ALCh+4ezipoK9gKYy qs+8khvkoFHxUpvt1zU9JFqXB3scUcJjhEZI8uuBPmzhkxnBiug3watAHnzP5k82nglr fUgABSDqOcAhiQS36f52P6wz/SwOC859PleH70NWEH3Vb2FdQnPJ6Dw1dpfkWfEDnWGy yBUQ== X-Gm-Message-State: ABy/qLaUWCunnamSuZ6op6G3YcGo9SYsoMdQxnGWmA7aKm8c8owusA9K DiqkTTDJZcJt/WEoCDdzDSUqN4Ja929p/czV+94xKg== X-Google-Smtp-Source: APBJJlG7+zHGu1w8bxIwCUtBJEKfBtFxTsSP0BtXU0PqxRMBa3Iw/PREYZJ2ct8QsRYj5NMluT+xYA== X-Received: by 2002:a0d:d60c:0:b0:576:8a5a:87e5 with SMTP id y12-20020a0dd60c000000b005768a5a87e5mr3399556ywd.26.1689295058503; Thu, 13 Jul 2023 17:37:38 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-cb70-e592-de93-e6d2.res6.spectrum.com. [2603:6081:7b00:6400:cb70:e592:de93:e6d2]) by smtp.gmail.com with ESMTPSA id y7-20020a0dd607000000b005616d72f435sm2036552ywd.116.2023.07.13.17.37.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jul 2023 17:37:38 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 2/5] arm: mx5: Correct mxc_set_clock function prototype Date: Thu, 13 Jul 2023 20:37:33 -0400 Message-Id: <20230714003736.3512509-2-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230714003736.3512509-1-trini@konsulko.com> References: <20230714003736.3512509-1-trini@konsulko.com> 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 With gcc-13.1 we get a warning about enum vs int here, so correct the declaration to match the implementation. Signed-off-by: Tom Rini --- arch/arm/include/asm/arch-mx5/clock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-mx5/clock.h b/arch/arm/include/asm/arch-mx5/clock.h index 63a51042e1eb..d585b5cf4b22 100644 --- a/arch/arm/include/asm/arch-mx5/clock.h +++ b/arch/arm/include/asm/arch-mx5/clock.h @@ -42,7 +42,7 @@ enum mxc_clock { u32 imx_get_uartclk(void); u32 imx_get_fecclk(void); unsigned int mxc_get_clock(enum mxc_clock clk); -int mxc_set_clock(u32 ref, u32 freq, u32 clk_type); +int mxc_set_clock(u32 ref, u32 freq, enum mxc_clock clk); void set_usb_phy_clk(void); void enable_usb_phy1_clk(bool enable); void enable_usb_phy2_clk(bool enable); From patchwork Fri Jul 14 00:37:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1807479 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; 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=n629Yxs9; dkim-atps=neutral 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R2CJK0m9Wz20bt for ; Fri, 14 Jul 2023 10:38:25 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2C8F286C1D; Fri, 14 Jul 2023 02:37:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com 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=konsulko.com header.i=@konsulko.com header.b="n629Yxs9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6055B86C16; Fri, 14 Jul 2023 02:37:48 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-yb1-xb34.google.com (mail-yb1-xb34.google.com [IPv6:2607:f8b0:4864:20::b34]) (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 8596B86C39 for ; Fri, 14 Jul 2023 02:37:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yb1-xb34.google.com with SMTP id 3f1490d57ef6-cb4de3bd997so1389383276.1 for ; Thu, 13 Jul 2023 17:37:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1689295059; x=1691887059; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=g90AqGDgIpsWaHPlYnUAQ3d4j0kofX9fD2+vHWQWCzQ=; b=n629Yxs9EM6ViiuziGQEUpgK80yCugU8U4bdULNXnMAKT0tSEN945HwkbNTNC2RFqk USpOI04XHxF+FtDOVZD5V/Tv/OgA9/fOFLzWykIdc5kmYZ4algi0YZNcKejH75BGNd/l rr6ajQ5qYsasVNVECWFm64F79L+l32+vMmQgU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689295059; x=1691887059; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=g90AqGDgIpsWaHPlYnUAQ3d4j0kofX9fD2+vHWQWCzQ=; b=J865Yxy7eYNt8pedzhdFfWC9tBfYg1H3zY95+tJMCWtfy8dUi2n3PhNGko369U0vaU 6MchHXj5vrrqUDlxwYCnndHONm0NudNX8CDb+KUE2Shg8ZRGmbHY2b9W4FrW16YEgSdH papaYS6sdCrAGuEi9+anAiWhSTic34dyNudJVcj1MoIkYnXp0wADivlUqS5opFfSGlUx xNqT4+eQHLV3mwWYUAIDQg6wq0xcNbuiD3OrLuIgO6Dvce4mTDLunGwI2nnWtxftI1OA fyCCSjv4GVUDKYbBUMRk5bp+QjI1WGUTh76tm21Tr8gUbkeAPI7Y+2/6UUNiEZogBuB3 VWew== X-Gm-Message-State: ABy/qLZtlLNpvgYMbQyMDQvr2qNsVQwJMw6iccXIZFYEwd71gJJBgTuQ MovKJLomldc01s5WRSSuz7pURQxhu4EtRIhYX/PMYw== X-Google-Smtp-Source: APBJJlHRj51eUqFwCvmFTPfvRsecA/2ueicjAf4mVD+2BCbanMNf3l783yNPYz2gqhD28iruExpTmg== X-Received: by 2002:a25:aea6:0:b0:c1b:6de8:5395 with SMTP id b38-20020a25aea6000000b00c1b6de85395mr1449724ybj.16.1689295059112; Thu, 13 Jul 2023 17:37:39 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-cb70-e592-de93-e6d2.res6.spectrum.com. [2603:6081:7b00:6400:cb70:e592:de93:e6d2]) by smtp.gmail.com with ESMTPSA id y7-20020a0dd607000000b005616d72f435sm2036552ywd.116.2023.07.13.17.37.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jul 2023 17:37:38 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 3/5] spl: Correct spl_board_boot_device function prototype Date: Thu, 13 Jul 2023 20:37:34 -0400 Message-Id: <20230714003736.3512509-3-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230714003736.3512509-1-trini@konsulko.com> References: <20230714003736.3512509-1-trini@konsulko.com> 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 With gcc-13.1 we get a warning about enum vs int here, so correct the declaration to match the implementation. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- include/spl.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/spl.h b/include/spl.h index 658d36481dee..92bcaa90a4af 100644 --- a/include/spl.h +++ b/include/spl.h @@ -31,6 +31,7 @@ struct legacy_img_hdr; struct blk_desc; struct legacy_img_hdr; struct spl_boot_device; +enum boot_device; /* * u_boot_first_phase() - check if this is the first U-Boot phase @@ -525,7 +526,7 @@ void spl_board_prepare_for_linux(void); void spl_board_prepare_for_optee(void *fdt); void spl_board_prepare_for_boot(void); int spl_board_ubi_load_image(u32 boot_device); -int spl_board_boot_device(u32 boot_device); +int spl_board_boot_device(enum boot_device boot_dev_spl); /** * spl_board_loader_name() - Return a name for the loader From patchwork Fri Jul 14 00:37:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1807481 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; 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=c/LtP1Xf; dkim-atps=neutral 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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R2CJf6gLYz20bt for ; Fri, 14 Jul 2023 10:38:42 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9DF8086CF1; Fri, 14 Jul 2023 02:38:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com 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=konsulko.com header.i=@konsulko.com header.b="c/LtP1Xf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 976E986CE4; Fri, 14 Jul 2023 02:37:53 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-yw1-x112d.google.com (mail-yw1-x112d.google.com [IPv6:2607:f8b0:4864:20::112d]) (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 4D00F86CA4 for ; Fri, 14 Jul 2023 02:37:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yw1-x112d.google.com with SMTP id 00721157ae682-579efc32377so13382607b3.1 for ; Thu, 13 Jul 2023 17:37:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1689295060; x=1691887060; 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=wHE/ttH2fbaTxMAYargz4oXUivqPVNYD8najJNKBbWQ=; b=c/LtP1XfLwmj9lefG9u1iPVcvD3JjK06RKKMpjMQ5nfbXDb+fGuVReh2p43AmRnEAz TRvYSreYSiIt9imx4Vz5afJq5r0lArUFq5PlRyy67GFwMmX+P1alsD+f9yYY6WrmXu3e uga30pqBm9ALRTRk+3W3UWyMjXDE39Kp9d3JE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689295060; x=1691887060; 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=wHE/ttH2fbaTxMAYargz4oXUivqPVNYD8najJNKBbWQ=; b=Y2bXA0p0Nakwj4GurQ1MrgW4hPKRnVlBzUb3mzcXubLEZexnFyVn/99NMZhEKVkoHO FpRP+G5mJeDbogtFLtosg+qUkilBbImGZnIzj7nHsBDPSZUQGVrHpRPFS3ECGvGI7Ine KXOdLvaqHYNT4yLpZgcCZxdAtfRMBhXqEmfH4Mwzf0i0vKsGBYzFUHCjIwiSjn3ZJZL4 hNc51OEQB01VQ93RNvyHY6CNIUMGzhQzs36pz34f8NiWlZbWrblVMaJPawPMnehCrBr+ GxoTsao4Q80wRICBI/mCm7/7TmGngN5wutWy6Mr1+G0UUhORR09lle7mfGQ2jSqZzIPE uyVQ== X-Gm-Message-State: ABy/qLbyWRPQIAUq+RA2kON1sQr4oqMvH9O6DiicBP5+yGHNIxOeE1nr iCnAR+uijI7vdYDG0G0No58E/OLvL+16FU8bdifs4g== X-Google-Smtp-Source: APBJJlENgk5TkbrQjIQG3E5c63bgEGeUQEdhRPpNAJJiOAu+5IicXVvDOd9YG2i9lHh0AVWy82Uydw== X-Received: by 2002:a81:528b:0:b0:56d:244:ab13 with SMTP id g133-20020a81528b000000b0056d0244ab13mr2929018ywb.28.1689295059804; Thu, 13 Jul 2023 17:37:39 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-cb70-e592-de93-e6d2.res6.spectrum.com. [2603:6081:7b00:6400:cb70:e592:de93:e6d2]) by smtp.gmail.com with ESMTPSA id y7-20020a0dd607000000b005616d72f435sm2036552ywd.116.2023.07.13.17.37.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jul 2023 17:37:39 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Alexey Brodkin , Heinrich Schuchardt Subject: [PATCH 4/5] CI: Update to gcc-13.1.0 Date: Thu, 13 Jul 2023 20:37:35 -0400 Message-Id: <20230714003736.3512509-4-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230714003736.3512509-1-trini@konsulko.com> References: <20230714003736.3512509-1-trini@konsulko.com> 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 As this is the current version of the public cross toolchains we use, upgrade to this now. Suggested-by: Alexey Brodkin Signed-off-by: Tom Rini Acked-by: Alexey Brodkin Reviewed-by: Simon Glass --- Cc: Heinrich Schuchardt Heinrich, at this point is there a newer grub we should be testing? There's now 2 changes for RISC-V that we're cherry-picking for newer toolchains. --- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- tools/buildman/toolchain.py | 2 +- tools/docker/Dockerfile | 57 +++++++++++++++++++------------------ 4 files changed, 32 insertions(+), 31 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 76982ec3e52e..83cc6176e7b4 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -194,7 +194,7 @@ stages: ln -s /opt/nokia/libc6_2.5.1-1eglibc27+0m5_armel.deb nokia_rx51_tmp/ ln -s /opt/nokia/busybox_1.10.2.legal-1osso30+0m5_armel.deb nokia_rx51_tmp/ ln -s /opt/nokia/qemu-system-arm nokia_rx51_tmp/ - export PATH=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin:$PATH + export PATH=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin:$PATH test/nokia_rx51_test.sh - job: pylint diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7ffb8f5dfdc..5300813cf511 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -232,7 +232,7 @@ Run tests for Nokia RX-51 (aka N900): ln -s /opt/nokia/libc6_2.5.1-1eglibc27+0m5_armel.deb nokia_rx51_tmp/; ln -s /opt/nokia/busybox_1.10.2.legal-1osso30+0m5_armel.deb nokia_rx51_tmp/; ln -s /opt/nokia/qemu-system-arm nokia_rx51_tmp/; - export PATH=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin:$PATH; + export PATH=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin:$PATH; test/nokia_rx51_test.sh # Check for any pylint regressions diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index 0ecd8458b912..1001b612086f 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -499,7 +499,7 @@ class Toolchains: if arch == 'aarch64': arch = 'arm64' base = 'https://www.kernel.org/pub/tools/crosstool/files/bin' - versions = ['12.2.0', '11.1.0'] + versions = ['13.1.0', '12.2.0'] links = [] for version in versions: url = '%s/%s/%s/' % (base, arch, version) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index f72cba0b8cc4..2f2ace2e6554 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -14,18 +14,18 @@ RUN apt-get update && apt-get install -y gnupg2 wget xz-utils && rm -rf /var/lib RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - RUN echo deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main | tee /etc/apt/sources.list.d/llvm.list -# Manually install the kernel.org "Crosstool" based toolchains for gcc-12.2.0 -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-aarch64-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-arm-linux-gnueabi.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-i386-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-m68k-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-mips-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-microblaze-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-nios2-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-powerpc-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-riscv64-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-riscv32-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-sh2-linux.tar.xz | tar -C /opt -xJ +# Manually install the kernel.org "Crosstool" based toolchains for gcc-13.1.0 +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-aarch64-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-arm-linux-gnueabi.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-i386-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-m68k-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-mips-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-microblaze-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-nios2-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-powerpc-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-riscv64-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-riscv32-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-sh2-linux.tar.xz | tar -C /opt -xJ # Manually install other toolchains 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 @@ -129,15 +129,16 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ git config --global user.name "GitLab CI Runner" && \ git config --global user.email trini@konsulko.com && \ git cherry-pick 049efdd72eb7baa7b2bf8884391ee7fe650da5a0 && \ + git cherry-pick 403d6540cd608b2706cfa0cb4713f7e4b490ff45 && \ ./bootstrap && \ mkdir -p /opt/grub && \ ./configure --target=aarch64 --with-platform=efi \ CC=gcc \ - TARGET_CC=/opt/gcc-12.2.0-nolibc/aarch64-linux/bin/aarch64-linux-gcc \ - TARGET_OBJCOPY=/opt/gcc-12.2.0-nolibc/aarch64-linux/bin/aarch64-linux-objcopy \ - TARGET_STRIP=/opt/gcc-12.2.0-nolibc/aarch64-linux/bin/aarch64-linux-strip \ - TARGET_NM=/opt/gcc-12.2.0-nolibc/aarch64-linux/bin/aarch64-linux-nm \ - TARGET_RANLIB=/opt/gcc-12.2.0-nolibc/aarch64-linux/bin/aarch64-linux-ranlib && \ + TARGET_CC=/opt/gcc-13.1.0-nolibc/aarch64-linux/bin/aarch64-linux-gcc \ + TARGET_OBJCOPY=/opt/gcc-13.1.0-nolibc/aarch64-linux/bin/aarch64-linux-objcopy \ + TARGET_STRIP=/opt/gcc-13.1.0-nolibc/aarch64-linux/bin/aarch64-linux-strip \ + TARGET_NM=/opt/gcc-13.1.0-nolibc/aarch64-linux/bin/aarch64-linux-nm \ + TARGET_RANLIB=/opt/gcc-13.1.0-nolibc/aarch64-linux/bin/aarch64-linux-ranlib && \ make && \ ./grub-mkimage -O arm64-efi -o /opt/grub/grubaa64.efi --prefix= -d \ grub-core cat chain configfile echo efinet ext2 fat halt help linux \ @@ -147,11 +148,11 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ make clean && \ ./configure --target=arm --with-platform=efi \ CC=gcc \ - TARGET_CC=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-gcc \ - TARGET_OBJCOPY=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-objcopy \ - TARGET_STRIP=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-strip \ - TARGET_NM=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-nm \ - TARGET_RANLIB=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ranlib && \ + TARGET_CC=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-gcc \ + TARGET_OBJCOPY=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-objcopy \ + TARGET_STRIP=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-strip \ + TARGET_NM=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-nm \ + TARGET_RANLIB=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ranlib && \ make && \ ./grub-mkimage -O arm-efi -o /opt/grub/grubarm.efi --prefix= -d \ grub-core cat chain configfile echo efinet ext2 fat halt help linux \ @@ -161,11 +162,11 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ make clean && \ ./configure --target=riscv64 --with-platform=efi \ CC=gcc \ - TARGET_CC=/opt/gcc-12.2.0-nolibc/riscv64-linux/bin/riscv64-linux-gcc \ - TARGET_OBJCOPY=/opt/gcc-12.2.0-nolibc/riscv64-linux/bin/riscv64-linux-objcopy \ - TARGET_STRIP=/opt/gcc-12.2.0-nolibc/riscv64-linux/bin/riscv64-linux-strip \ - TARGET_NM=/opt/gcc-12.2.0-nolibc/riscv64-linux/bin/riscv64-linux-nm \ - TARGET_RANLIB=/opt/gcc-12.2.0-nolibc/riscv64-linux/bin/riscv64-linux-ranlib && \ + TARGET_CC=/opt/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux-gcc \ + TARGET_OBJCOPY=/opt/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux-objcopy \ + TARGET_STRIP=/opt/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux-strip \ + TARGET_NM=/opt/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux-nm \ + TARGET_RANLIB=/opt/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux-ranlib && \ make && \ ./grub-mkimage -O riscv64-efi -o /opt/grub/grubriscv64.efi --prefix= -d \ grub-core cat chain configfile echo efinet ext2 fat halt help linux \ @@ -276,7 +277,7 @@ RUN virtualenv -p /usr/bin/python3 /tmp/venv && \ # Create the buildman config file RUN /bin/echo -e "[toolchain]\nroot = /usr" > ~/.buildman -RUN /bin/echo -e "kernelorg = /opt/gcc-12.2.0-nolibc/*" >> ~/.buildman +RUN /bin/echo -e "kernelorg = /opt/gcc-13.1.0-nolibc/*" >> ~/.buildman RUN /bin/echo -e "arc = /opt/arc_gnu_2021.03_prebuilt_uclibc_le_archs_linux_install" >> ~/.buildman RUN /bin/echo -e "\n[toolchain-prefix]\nxtensa = /opt/2020.07/xtensa-dc233c-elf/bin/xtensa-dc233c-elf-" >> ~/.buildman; RUN /bin/echo -e "\n[toolchain-alias]\nsh = sh2" >> ~/.buildman From patchwork Fri Jul 14 00:37:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1807480 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; 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=mmAa0omK; dkim-atps=neutral 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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R2CJR28Dhz20bt for ; Fri, 14 Jul 2023 10:38:31 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 769E586CF4; Fri, 14 Jul 2023 02:37:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com 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=konsulko.com header.i=@konsulko.com header.b="mmAa0omK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D940F86C1D; Fri, 14 Jul 2023 02:37:49 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-yw1-x1136.google.com (mail-yw1-x1136.google.com [IPv6:2607:f8b0:4864:20::1136]) (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 E8D5886CB8 for ; Fri, 14 Jul 2023 02:37:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yw1-x1136.google.com with SMTP id 00721157ae682-57eb0df5265so11788387b3.3 for ; Thu, 13 Jul 2023 17:37:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1689295060; x=1691887060; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=uuJKB4ycvEuauA/EDrPnFdB8V2yLWvPxKdeSN8MrHZY=; b=mmAa0omK4GwtnemMxmtikbyIX72x4eI0R3+TfHTqUQhlOIIwgI+O8Rv41Q48OGbtnY jeP+feFA/d26XXf2AFw6BTVHlyvPGWlt8Cmck/MZ1SPNzhyrBWrfecF9ONAfDLWlrgmr eZAzQ0jIG4H5bUmoPfhmKFJscuS0mWirzbnjI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689295060; x=1691887060; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uuJKB4ycvEuauA/EDrPnFdB8V2yLWvPxKdeSN8MrHZY=; b=lhla4GuEU8Ujp0cxZudJsXRGHKM7YNPH0LF7ZvTtLcpCHKBz65pRvvct/mmj8GG7jx VyQhuKrV4s2TUmTfK2JQVPYaK6FBTr2d79sPuyIZ3xoSE2aIPjjDtM3rNOSoFxd4bgFR E6Ga0N6UlCtZnEDPrFKUX/yVvB5U19yni38NLHxs2WMOhsfcoknpYuHooDCsTMSElSu6 hdEjweB0ilM53t5KyxDJusIQ+PYTOcrpOkJbTcikF3cv3oPNnzhfymGHtZv64LzMAtJr avDzkXgImD0umBsG1WCFdndoEcprrdVxHy8CqSdsqFUlw1z/9OabJ0Sj8oDddoDyTiO+ BlOA== X-Gm-Message-State: ABy/qLaQAsvVGJO4qnDuni+66oE5v5WVtZn/GaOZIhPufwLky0Stzn55 rHHyVrQsviK5lOSdtWC5iZ982naRqoi82Y3tzOpCDA== X-Google-Smtp-Source: APBJJlHQdhu1Zq7PhJPhib4nn3OQrLDv3Az38wyUWqoWOhHEgPJnwDFv73LmuQ6MxmsP9IDzg3RpcQ== X-Received: by 2002:a81:6609:0:b0:57a:8456:3401 with SMTP id a9-20020a816609000000b0057a84563401mr3662827ywc.29.1689295060563; Thu, 13 Jul 2023 17:37:40 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-cb70-e592-de93-e6d2.res6.spectrum.com. [2603:6081:7b00:6400:cb70:e592:de93:e6d2]) by smtp.gmail.com with ESMTPSA id y7-20020a0dd607000000b005616d72f435sm2036552ywd.116.2023.07.13.17.37.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jul 2023 17:37:40 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 5/5] CI: Update to the latest "Jammy" tag Date: Thu, 13 Jul 2023 20:37:36 -0400 Message-Id: <20230714003736.3512509-5-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230714003736.3512509-1-trini@konsulko.com> References: <20230714003736.3512509-1-trini@konsulko.com> 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 Move to the latest "Jammy" tag from Ubuntu. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- tools/docker/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 83cc6176e7b4..929c8797d5eb 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -2,7 +2,7 @@ variables: windows_vm: windows-2019 ubuntu_vm: ubuntu-22.04 macos_vm: macOS-12 - ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20230308-04Apr2023 + ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20230624-13Jul2023 # Add '-u 0' options for Azure pipelines, otherwise we get "permission # denied" error when it tries to "useradd -m -u 1001 vsts_azpcontainer", # since our $(ci_runner_image) user is not root. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5300813cf511..3017df51ff75 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ default: # Grab our configured image. The source for this is found # in the u-boot tree at tools/docker/Dockerfile -image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:jammy-20230308-04Apr2023 +image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:jammy-20230624-13Jul2023 # We run some tests in different order, to catch some failures quicker. stages: diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 2f2ace2e6554..7792fb0f3a38 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -2,7 +2,7 @@ # This Dockerfile is used to build an image containing basic stuff to be used # to build U-Boot and run our test suites. -FROM ubuntu:jammy-20230308 +FROM ubuntu:jammy-20230624 MAINTAINER Tom Rini LABEL Description=" This image is for building U-Boot inside a container"