From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id OMgMOdIZCGGjDQEAgWs5BA (envelope-from ) for ; Mon, 02 Aug 2021 18:14:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id mGnJNNIZCGFKHAAAB5/wlQ (envelope-from ) for ; Mon, 02 Aug 2021 16:14:10 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 40BE8564E for ; Mon, 2 Aug 2021 18:14:10 +0200 (CEST) Received: from localhost ([::1]:35228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mAaZt-0000ev-72 for larch@yhetil.org; Mon, 02 Aug 2021 12:14:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAaZm-0000eX-SX for guix-patches@gnu.org; Mon, 02 Aug 2021 12:14:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55806) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mAaZm-0005WN-Kt for guix-patches@gnu.org; Mon, 02 Aug 2021 12:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mAaZm-0005fC-FO for guix-patches@gnu.org; Mon, 02 Aug 2021 12:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49552] [PATCH] gnu: u-boot: Update to 2021.07. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Aug 2021 16:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49552 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Vagrant Cascadian Cc: Mathieu Othacehe , Pierre Langlois , 49552-done@debbugs.gnu.org Received: via spool by 49552-done@debbugs.gnu.org id=D49552.162792078321695 (code D ref 49552); Mon, 02 Aug 2021 16:14:02 +0000 Received: (at 49552-done) by debbugs.gnu.org; 2 Aug 2021 16:13:03 +0000 Received: from localhost ([127.0.0.1]:39119 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAaYp-0005dq-6k for submit@debbugs.gnu.org; Mon, 02 Aug 2021 12:13:03 -0400 Received: from mout.gmx.net ([212.227.15.19]:41979) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAaYm-0005dI-Vo for 49552-done@debbugs.gnu.org; Mon, 02 Aug 2021 12:13:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1627920767; bh=oGXxFRMvzJvAyD/F9UaYIXTUS9oAV4CwLr6tDIz0YA0=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to; b=S6kJXNUx4eSaWL6P1r+tDwg4FLkVZIsN9Z6LOAIhuqCfFI89YtqnjV5huO/XVy/Bv qJqkpugEYHk3ZTe6lCW0oqC1bOlcHBkzAbpgMEI8xC4BNlkJX4H4gKK1uVqX2VNHM7 rsNXuP989GvcMpsZBvbYLpE+QeaQYAsheCnGM2Qo= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1N0X8o-1n74vK32Wa-00wZ5d; Mon, 02 Aug 2021 18:12:46 +0200 References: <87mtqqkmwo.fsf@gmx.com> <875ywyqtfj.fsf@gnu.org> <87lf5ugw71.fsf@yucca> <87mtq9s5ui.fsf@gmx.com> <87lf5k6fo4.fsf@yucca> <87lf5k81qm.fsf@gmx.com> User-agent: mu4e 1.6.1; emacs 27.2 From: Pierre Langlois Date: Mon, 02 Aug 2021 17:02:13 +0100 In-reply-to: <87lf5k81qm.fsf@gmx.com> Message-ID: <87im0n966g.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Provags-ID: V03:K1:UULRpsT95sw7tF9nP+f03CblTpc7jHeBz7eQItvHLkcdI0FU1h9 cu1dFfjoPUDgboHqPBCCnTP/O870AYf8qJpPNuyflgBdDZ5X7nT9UfRsZdVuvq/Z/5uEAwp NiK9AM1WnspQ712BazEhKgpDK+lJU0zBQSt4RwNQV2sLhF/fKymWd/7AYE1dQ+aVBQ+CP8W /vbL594ki1H5rgDV8550A== X-UI-Out-Filterresults: notjunk:1;V03:K0:zS/63M2MOsw=:axYbSZTYKuwwPt/nsWXyz5 sJLKMC2wjsAHR1B6bu8ncj7FtV12ChTUpimw7LJYz60cF16s3AdY3hGRRw/DZUoH1g+1icUWA 8iOdIXhe2K5HhqGWv8ubXzqgfnMXwNm7H6AysZLXjy76IAWI74xzQ0SL4TEEWHxAtnkDQMtcn 4XcHl+WlgwcATNq4IrQBt7ym4MlwKQeq5scPSxOezzjqbUXv5hW1Bg3Qd3AXM8xoeugOo8sX8 ZqGdVB9YwowzeDYbsEvPbZlVk9fe1ZeQQ08kMXE5/ozET1teuLdSQyRRREPkOA1wYJMrkdylk eNRkMl0+VE8/0N6tFsPPjN0yJkXi8jKvO/pOyoTxTGFTO6HPnpkx5lJazYKBSkO30CegMaQUv 0TBtD3WO9XAAyBJGWMLCpjbxqvhhF2PCW1/oH4oxQmjex55kD6UQf+1M/1AxnkdyA0t/Fx8MB JpUJW33jiUqXRiVHkWC9QlG8b0Pk33Sela7LsdLots+DcGM5DwFomAd5dGwGhj7QPQA3ye7Za VnSOS56m4m2dr/8a53Jse9VNTm8fdvMLvAwTBLBCTuslLVhtD4B30JxwpDX3RTVp/qhO/ycc2 ijnUnDktrPXgkiAVfe5jJVz8T9+X2bsG9uSG3p3lBeQV6B6lTcysdcRuqFu1yLydDIY4uayxc 60zse2t+xBk0mDuzt5aHk8iIn3HSWJruplrUt0o7ji1QBGWDTSjSSDpaIhi6poVlaAYDaopoQ ChliCvfpKvyCkO9IvZzVcSZPfvD3qC19EWqCrLyWz8nuBicN5viZl3VerovfOhnoaFy+6G7DC KWceANcoEZHjSuHYDEDHtuh04B8plMLmIYzrKIinGW303GB3h0pU1qStoq0oHRzS7+yFDFb2i NtE2ePa2srsJMGrP0K0nWbPq2OvJzBsncJELhzWAZPrlYyQH1ZsjOSbTihrMASG/3hyvqSjac w+8sAzHgJeq64gzpLlqOnjK1WU8M54fvzsahrP+TIwXOT5Tp3Y93qyb4rEa2rXdv0jW6VWMBB u6N/OfPKKeXmrNCe8zfswuOs/nrKacXYdYu+Koy/PGrYByEtwXBQxiRCRBS8AHEES38FW+cUw XzOsMBg4LACIK2ILZZg+qQJajr/d7jRcnnUBhe1gO47XFAmt3tQMXIePQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1627920850; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=uqZdtJciHziPWW/grVddqd49ttKG5Ho1LAwvGIIcbLo=; b=BU2i3VKafbiobnNULVR+XvsDBDqq1Jv/vzlFZiKmbZkLr9VeNGiqPYFnmwVPZrUZ9zwxep wVMiYPYCE0TuI8p4dEfmYOHJOj0Fo3smxvW+0COxHhxclfXH6k9m/aSd9/Y9uo6IWjInsI 5AfznX/7ru2yp1VcZ+YIFX9wmBmn1F8MSpdYe315JHAi7ppCvVxNPacuyCD4mFCsb3eUbh WNPZRo4oHJd3kcD20hMzQRHPdN0YRCVHF69fBUyXTK5WhdgZBFO2g+rKdfTKKZU7SIqenz xPbS5fe8xnBWsPaYU/ZqPvME3v6MAPuDRYxT1JEetfDXPz/NYT3sLHbeshXDGw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627920850; a=rsa-sha256; cv=none; b=Ie7EekWXLjvVms+9MVqoM96gsCHt+B8WLGajeL0pMpxTfd+Ah8PyXjwx0f2A0f5sRkpSqu gVBJaFftyxC+9ah5AOMBIIbGGHT4Unzx8AJxIPcQuMhPKsZcwfuMJFSvk4674tgIBj9d+u 9xGVp+XR+8OUJuMX0EFoGE7puvImljwLy5TY+ioyPeeRX/8JYBh7oV7eqV2ne2CXo0V5cN B7fMK485ptxhXgpunXVV5V76GM5yapO8JqsoH/3TIwGpoCxdnTsGSTz3ymlxpGdnSlv5Sa hJZbU0B/h+s25N4y5MAilfvMPn/ARO79SZzfXzsQvKl2uCGR+hg5S7K4ttiudw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=S6kJXNUx; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -3.42 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=S6kJXNUx; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 40BE8564E X-Spam-Score: -3.42 X-Migadu-Scanner: scn0.migadu.com X-TUID: ZVdTHaOk8CTL --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Hello, Pierre Langlois writes: (snip) >>> That being said, while it works on pinebookpro, I still need an extra >>> patch on the rockpro64 in order to boot, both on master with u-boot >>> 2021.07 :-/ (see #49550). >>> >>> Were you able to confirm the issue? I see it looks like we have the same >>> configuration in debian and guix, CONFIG_USE_PREBOOT=y and the >>> "inno-usb" patch applied, mmmm >> >> Seems like you fixed the core of that problem in another commit! >> >> Patch looks good to me, thanks for working on it! > > Thanks for the review! I've just pushed it as > eb46c6c5c81695af475f7e1e416d05e51157fe60, with a couple of tweaks to > make `guix lint' happy (the patch filename was a little too long, as > well as a line was over the column limit). It turns out I broke a few u-boot packages :-/ https://ci.guix.gnu.org/eval/70864?status=failed u-boot-tools failing to build on aarch64 appears to be unrelated, it's due to libical which builds just fine for me on my rockpro64. However u-boot-vexpress, u-boot-sifive-fu540 and u-boot-qemu-riscv64-smode are real issues. Here are a couple of patches for them, they're pretty trivial so I'll push them soon unless anybody objects: --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmEIGXcYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31U2RYH/2AVX5iKOenm4buRB3Qqg+1b 43WZTrOgZJ91tew1sdsv7cree9cgHK0mJxS2IglCs5jIWOSXCO8/xKm1Ck0AyJCn Is0R6p74hs2/G9BqjM4pa3m+/d4H709fEWtpMDoXUeR/zbGEqYd0mq1VtLtpmwJX 9i1HLEPJoO5SeypgkKOr/jXu0GKQqWEffdP+6ufsxWsbXYf1nUmAoxpEin3hEWHY eOwAVax+wvh3QYJCZctI2jagVqXPdZ/thuvcGbO+VpNBZP4O0y3li30a/HzoiDvY NBhS9pqyaKu8eVMMXfcK5uikwJGzBVr7ETTPAxV/DebyT+N7Tsa/cTwMWL7BYt8= =W12+ -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-u-boot-vexpress-Downgrade-to-2021.04.patch Content-Transfer-Encoding: quoted-printable =46rom bb4f2831531b29194d5de499a52f6bf8aaaf93ad Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Mon, 2 Aug 2021 15:05:49 +0100 Subject: [PATCH 1/2] gnu: u-boot-vexpress: Downgrade to 2021.04. * gnu/packages/bootloaders.scm (u-boot-2021.04): New variable. (u-boot-vexpress): Downgrade to 2021.04. =2D-- gnu/packages/bootloaders.scm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 504b89f122..c64f5a09d5 100644 =2D-- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -533,6 +533,20 @@ tree binary files. These are board description files= used by Linux and BSD.") also initializes the boards (RAM etc).") (license license:gpl2+))) +(define u-boot-2021.04 + (package + (inherit u-boot) + (version "2021.04") + (source (origin + (patches (list %u-boot-rockchip-inno-usb-patch)) + (method url-fetch) + (uri (string-append + "https://ftp.denx.de/pub/u-boot/" + "u-boot-" version ".tar.bz2")) + (sha256 + (base32 + "06p1vymf0dl6jc2xy5w7p42mpgppa46lmpm2ishmgsycnldqnhqd")))= ))) + (define-public u-boot-tools (package (inherit u-boot) @@ -714,7 +728,12 @@ board-independent tools."))) #t))))))))) (define-public u-boot-vexpress - (make-u-boot-package "vexpress_ca9x4" "arm-linux-gnueabihf")) + ;; vexpress_ca9x4 support was removed with version 2021.07, + ;; see https://lists.denx.de/pipermail/u-boot/2021-February/440803.html= . + (package + (inherit (make-u-boot-package "vexpress_ca9x4" "arm-linux-gnueabihf")= ) + (version (package-version u-boot-2021.04)) + (source (package-source u-boot-2021.04)))) (define-public u-boot-malta (make-u-boot-package "malta" "mips64el-linux-gnuabi64")) =2D- 2.32.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-Rename-u-boot-sifive-fu540-to-sifive-unleashed.patch Content-Transfer-Encoding: quoted-printable =46rom 26957dac52584457d43d6139e2edc49074c7ca44 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Mon, 2 Aug 2021 15:13:11 +0100 Subject: [PATCH 2/2] gnu: Rename u-boot-sifive-fu540 to sifive-unleashed. * gnu/packages/bootloaders.scm (u-boot-sifive-fu540): Rename to ... (u-boot-sifive-unleashed): ... this. Change board name from sifive_fu540 = to sifive_unleashed. * gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch: Rename sifive_fu= 540 to sifive_unleashed. =2D-- gnu/packages/bootloaders.scm | 4 ++-- gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index c64f5a09d5..9b1bcf9da6 100644 =2D-- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -891,8 +891,8 @@ to Novena upstream, does not load u-boot.img from the = first partition.") (patches (search-patches "u-boot-riscv64-fix-extlinux.patch")))))= )) -(define-public u-boot-sifive-fu540 - (make-u-boot-package "sifive_fu540" "riscv64-linux-gnu")) +(define-public u-boot-sifive-unleashed + (make-u-boot-package "sifive_unleashed" "riscv64-linux-gnu")) (define-public u-boot-sifive-unmatched (make-u-boot-package "sifive_unmatched" "riscv64-linux-gnu")) diff --git a/gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch b/gnu/= packages/patches/u-boot-riscv64-fix-extlinux.patch index d6c1987718..468024ab00 100644 =2D-- a/gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch +++ b/gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch @@ -30,8 +30,8 @@ Index: u-boot/configs/qemu-riscv64_smode_defconfig +CONFIG_PREBOOT=3D"setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontr= oladdr};" Index: u-boot/configs/sifive_fu540_defconfig =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =2D--- u-boot.orig/configs/sifive_fu540_defconfig -+++ u-boot/configs/sifive_fu540_defconfig +--- u-boot.orig/configs/sifive_unleashed_defconfig ++++ u-boot/configs/sifive_unleashed_defconfig @@ -27,3 +27,5 @@ CONFIG_SPL_DM_SEQ_ALIAS=3Dy CONFIG_SPL_CLK=3Dy CONFIG_DM_MTD=3Dy =2D- 2.32.0 --=-=-= Content-Type: text/plain Thanks, Pierre --=-=-=--