From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id yGu9E1IMB2HJpwAAgWs5BA (envelope-from ) for ; Sun, 01 Aug 2021 23:04:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id kLZUD1IMB2EwQwAAbx9fmQ (envelope-from ) for ; Sun, 01 Aug 2021 21:04:18 +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 D443318A2F for ; Sun, 1 Aug 2021 23:04:17 +0200 (CEST) Received: from localhost ([::1]:51528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mAId6-00029U-Qq for larch@yhetil.org; Sun, 01 Aug 2021 17:04:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44404) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAIct-0001z5-Ih for guix-patches@gnu.org; Sun, 01 Aug 2021 17:04:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53725) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mAIct-0004ml-8j for guix-patches@gnu.org; Sun, 01 Aug 2021 17:04:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mAIct-0005kO-53 for guix-patches@gnu.org; Sun, 01 Aug 2021 17:04:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49552] [PATCH] gnu: u-boot: Update to 2021.07. Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 Aug 2021 21:04:03 +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: Pierre Langlois Cc: Mathieu Othacehe , 49552@debbugs.gnu.org Received: via spool by 49552-submit@debbugs.gnu.org id=B49552.162785183822067 (code B ref 49552); Sun, 01 Aug 2021 21:04:03 +0000 Received: (at 49552) by debbugs.gnu.org; 1 Aug 2021 21:03:58 +0000 Received: from localhost ([127.0.0.1]:37036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAIcg-0005jj-Si for submit@debbugs.gnu.org; Sun, 01 Aug 2021 17:03:58 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:34708) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAIce-0005jW-Hz for 49552@debbugs.gnu.org; Sun, 01 Aug 2021 17:03:49 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:21:21:0:100b]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id A06771A9FD; Sun, 1 Aug 2021 14:03:42 -0700 (PDT) From: Vagrant Cascadian In-Reply-To: <87mtq9s5ui.fsf@gmx.com> References: <87mtqqkmwo.fsf@gmx.com> <875ywyqtfj.fsf@gnu.org> <87lf5ugw71.fsf@yucca> <87mtq9s5ui.fsf@gmx.com> Date: Sun, 01 Aug 2021 14:03:39 -0700 Message-ID: <87lf5k6fo4.fsf@yucca> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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=1627851858; 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; bh=2GJPEJUnnPfG1VIFi7btCQNghpmgXqVGf9HNs1fWJ/I=; b=L2i3A9ZCjaOsBg8pJbp7uHNm2SuWg+OTCk4y41KuCCBXKmGUktEgrWZYc0uMMbMMCxqVik 3QNzHwFMt/gEO277UNLhXRUBGa6kFclzAnELvNiUsi0yHw6+xSmJN8L3ByU7xY1p/+7e5j iSQ8hauqiLCNdiVBKBC4wijja2waKp+9utnP7M40owBFubN2v7eIbrzn63E2DQANP1lqdp wo95sZ8Eh6HMtn7PTTrG8uwp6EV3kT71+bHgO6G/OHEIXbonqL+PxlimufW9yzM4IknxqP jPMPHDQsqU6z5jV6bHbhIsjv68UlwtYhDRVlP3WPJPNg2GDtOZ+ulfBHHuIdfQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627851858; a=rsa-sha256; cv=none; b=VEGFZpMfwSXrznSf4ZZa49RfsWQvJjjVptbVZK73aqKyxZukassGDqAiSRPjxdbh6XpJXy BWZu5SMXYsiN2Wn5l7m+GB4nsiEkGFdwK0pNbF2L95jLIUNShEnr/xsqT6tYx/N9bw9RvF CJMc5rlps2YGQulUTvuZLOUC3MGx17krre3QISsjrP9NOvmvFuPcg0UKN8zI3ByVJFJp/J sKNgdzj4yIfAiO7DVgTHM1747Cdb389G6j9eAnaU3EWgR0Jf1+Tn6AxVlEFmQDijGaXKcH ch/k5chJYJ9drXHoYuiirl6fdAG4xTTEWajXHJxG8PsKi2iKv3kPsbxZEKGmXQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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: -4.02 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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: D443318A2F X-Spam-Score: -4.02 X-Migadu-Scanner: scn1.migadu.com X-TUID: u7113xWr/mGB --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2021-07-26, Pierre Langlois wrote: > Vagrant Cascadian writes: > >> On 2021-07-25, Mathieu Othacehe wrote: >>>> * gnu/packages/bootloaders.scm (u-boot): Update to 2021.07. >>>> [native-inputs]: Add python-pycryptodomex. >>>> (u-boot-2021.07): Delete variable. >>>> (u-boot-tools)[arguments]: Adapt 'patch phase, disable failing test_sp= l test. >>>> (u-boot-sifive-unmatched): Use default u-boot package. >>>> (u-boot-pinebook-pro-rk3328): Use default u-boot package. >>> >>> This seems fine to me, Vagrant any objections here? >> >> Heh. Just uploaded 2021.07 to Debian last night! Been meaning to look at >> updating in guix, but apparently someone beat me to it :) >> >> Overall, sounds fine to me, with one relatively minor change... >> >> u-boot-sifive-unmatched will need a pretty trivial patch in order to >> update to 2021.07: >> >> https://bugs.launchpad.net/ubuntu/+source/u-boot/+bug/1937246 >> https://salsa.debian.org/debian/u-boot/-/blob/debian/latest/debian/pat= ches/riscv64/unmatched-prevent-relocating-initrd-and-fdt.patch >> >> At least, it did when building on Debian (and apparently Ubuntu)... > > Sure, I've added the patch! I don't have any HW to test sifive unmatched > support though, I did test the update on a pinebookpro and rockpro64 > when originally posting this, the new patch shouldn't affect them. I have pretty high confidence it's needed, has low risk for breaking other u-boot platforms, and riscv64 support in guix is pretty experimental at this point so I would say safe to go with it untested at this point... though at some point I can test it on actual hardware if it really is needed. > 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=3Dy 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! live well, vagrant > From 8a7b8f0b85a69fff085bd07da6777c1ebca31f74 Mon Sep 17 00:00:00 2001 > From: Pierre Langlois > Date: Sat, 10 Jul 2021 14:12:02 +0100 > Subject: [PATCH] gnu: u-boot: Update to 2021.07. > > * gnu/packages/patches/u-boot-sifive-prevent-relocating-initrd-fdt.patch:= New patch. > * gnu/local.mk (dist_patch_DATA): Add it. > * gnu/packages/bootloaders.scm (u-boot): Update to 2021.07. > [native-inputs]: Add python-pycryptodomex. > (u-boot-2021.07): Delete variable. > (u-boot-tools)[arguments]: Adapt 'patch phase, disable failing test_spl t= est. > (u-boot-sifive-unmatched): Use default u-boot package. > (u-boot-pinebook-pro-rk3328): Use default u-boot package. > --- > gnu/local.mk | 1 + > gnu/packages/bootloaders.scm | 48 ++++++++----------- > ...sifive-prevent-relocating-initrd-fdt.patch | 16 +++++++ > 3 files changed, 36 insertions(+), 29 deletions(-) > create mode 100644 gnu/packages/patches/u-boot-sifive-prevent-relocating= -initrd-fdt.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index b944c671af..495a94a988 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1772,6 +1772,7 @@ dist_patch_DATA =3D \ > %D%/packages/patches/tuxpaint-stamps-path.patch \ > %D%/packages/patches/twinkle-bcg729.patch \ > %D%/packages/patches/u-boot-rockchip-inno-usb.patch \ > + %D%/packages/patches/u-boot-sifive-prevent-relocating-initrd-fdt.patch= \ > %D%/packages/patches/u-boot-riscv64-fix-extlinux.patch \ > %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ > %D%/packages/patches/udiskie-no-appindicator.patch \ > diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm > index 742992a119..09125b1582 100644 > --- a/gnu/packages/bootloaders.scm > +++ b/gnu/packages/bootloaders.scm > @@ -12,7 +12,7 @@ > ;;; Copyright =C2=A9 2019 Mathieu Othacehe > ;;; Copyright =C2=A9 2020 Bj=C3=B6rn H=C3=B6fling > ;;; Copyright =C2=A9 2018, 2019, 2020 Vagrant Cascadian > -;;; Copyright =C2=A9 2020 Pierre Langlois > +;;; Copyright =C2=A9 2020, 2021 Pierre Langlois > ;;; Copyright =C2=A9 2021 Vincent Legoll > ;;; Copyright =C2=A9 2021 Brice Waegeneire > ;;; > @@ -56,6 +56,7 @@ > #:use-module (gnu packages perl) > #:use-module (gnu packages pkg-config) > #:use-module (gnu packages python) > + #:use-module (gnu packages python-crypto) > #:use-module (gnu packages texinfo) > #:use-module (gnu packages tls) > #:use-module (gnu packages sdl) > @@ -493,20 +494,26 @@ tree binary files. These are board description fil= es used by Linux and BSD.") > ;; and https://patchwork.ozlabs.org/project/uboot/patch/20210406151059= .1187379-1-icenowy@aosc.io > (search-patch "u-boot-rockchip-inno-usb.patch")) >=20=20 > +(define %u-boot-sifive-prevent-relocating-initrd-fdt > + ;; Fix boot in 2021.07 on Hifive unmatched, see > + ;; https://bugs.launchpad.net/ubuntu/+source/u-boot/+bug/1937246 > + (search-patch "u-boot-sifive-prevent-relocating-initrd-fdt.patch")) > + > (define u-boot > (package > (name "u-boot") > - (version "2021.04") > + (version "2021.07") > (source (origin > (patches > - (list %u-boot-rockchip-inno-usb-patch)) > + (list %u-boot-rockchip-inno-usb-patch > + %u-boot-sifive-prevent-relocating-initrd-fdt)) > (method url-fetch) > (uri (string-append > "https://ftp.denx.de/pub/u-boot/" > "u-boot-" version ".tar.bz2")) > (sha256 > (base32 > - "06p1vymf0dl6jc2xy5w7p42mpgppa46lmpm2ishmgsycnldqnhqd"))= )) > + "0zm7igkdnz0w4ir8rfl2dislfrl0ip104grs5hvd30a5wkm7wari"))= )) > (native-inputs > `(("bc" ,bc) > ("bison" ,bison) > @@ -516,6 +523,7 @@ tree binary files. These are board description files= used by Linux and BSD.") > ("perl" ,perl) > ("python" ,python) > ("python-coverage" ,python-coverage) > + ("python-pycryptodomex" ,python-pycryptodomex) > ("python-pytest" ,python-pytest) > ("swig" ,swig))) > (build-system gnu-build-system) > @@ -525,21 +533,6 @@ tree binary files. These are board description file= s used by Linux and BSD.") > also initializes the boards (RAM etc).") > (license license:gpl2+))) >=20=20 > -(define-public u-boot-2021.07 > - (package > - (inherit u-boot) > - (version "2021.07-rc4") > - (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 > - "0bnsywgy2b0jxim5h9dc807lqk5kq8hvgf4lcsmffnc0hf4isv8p"))))= )) > - > (define-public u-boot-tools > (package > (inherit u-boot) > @@ -568,9 +561,12 @@ also initializes the boards (RAM etc).") > ;; This test would require git. > (("\\./tools/patman/patman") (which "true")) > ;; FIXME: test fails, needs further investiation > - (("run_test \"binman\"") ": run_test \"binman\"") > + (("run_test \"binman\"") "# run_test \"binman\"") > + ;; FIXME: test_spl fails, needs further investiation > + (("test_ofplatdata or test_handoff or test_spl") > + "test_ofplatdata or test_handoff") > ;; FIXME: code coverage not working > - (("run_test \"binman code coverage\"") ": run_test \"binma= n code coverage\"") > + (("run_test \"binman code coverage\"") "# run_test \"binma= n code coverage\"") > ;; This test would require internet access. > (("\\./tools/buildman/buildman") (which "true"))) > (substitute* "test/py/tests/test_sandbox_exit.py" > @@ -879,11 +875,7 @@ to Novena upstream, does not load u-boot.img from th= e first partition.") > (make-u-boot-package "sifive_fu540" "riscv64-linux-gnu")) >=20=20 > (define-public u-boot-sifive-unmatched > - (let ((base (make-u-boot-package "sifive_unmatched" "riscv64-linux-gnu= "))) > - (package > - (inherit base) > - (version (package-version u-boot-2021.07)) > - (source (package-source u-boot-2021.07))))) > + (make-u-boot-package "sifive_unmatched" "riscv64-linux-gnu")) >=20=20 > (define-public u-boot-rock64-rk3328 > (let ((base (make-u-boot-package "rock64-rk3328" "aarch64-linux-gnu"))) > @@ -946,9 +938,7 @@ to Novena upstream, does not load u-boot.img from the= first partition.") > (define-public u-boot-pinebook-pro-rk3399 > (let ((base (make-u-boot-package "pinebook-pro-rk3399" "aarch64-linux-= gnu"))) > (package > - (inherit base) > - (version (package-version u-boot-2021.07)) > - (source (package-source u-boot-2021.07)) > + (inherit base) > (arguments > (substitute-keyword-arguments (package-arguments base) > ((#:phases phases) > diff --git a/gnu/packages/patches/u-boot-sifive-prevent-relocating-initrd= -fdt.patch b/gnu/packages/patches/u-boot-sifive-prevent-relocating-initrd-f= dt.patch > new file mode 100644 > index 0000000000..a5b92e3e8f > --- /dev/null > +++ b/gnu/packages/patches/u-boot-sifive-prevent-relocating-initrd-fdt.pa= tch > @@ -0,0 +1,16 @@ > +Description: prevent relocating initrd & fdt, that results in failure to= boot > +Author: Heinrich Schuchardt (xypron) > +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/u-boot/+bug/1937246 > +Index: u-boot-2021.07~rc4+dfsg/include/configs/sifive-unmatched.h > +=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 > +--- u-boot-2021.07~rc4+dfsg.orig/include/configs/sifive-unmatched.h > ++++ u-boot-2021.07~rc4+dfsg/include/configs/sifive-unmatched.h > +@@ -62,6 +62,8 @@ > + "name=3Dsystem,size=3D-,bootable,type=3D${type_guid_gpt_system};" > +=20 > + #define CONFIG_EXTRA_ENV_SETTINGS \ > ++ "fdt_high=3D0xffffffffffffffff\0" \ > ++ "initrd_high=3D0xffffffffffffffff\0" \ > + "kernel_addr_r=3D0x84000000\0" \ > + "fdt_addr_r=3D0x88000000\0" \ > + "scriptaddr=3D0x88100000\0" \ > --=20 > 2.32.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCYQcMKwAKCRDcUY/If5cW qu9jAQD4z8BsoIDa7xskzaQTtXDClgmECvv7g38LKhloHPaM6QD+OziCRoFBFXB7 /+Bsys9H15453mX033+VQTLyv8ea4QA= =nJta -----END PGP SIGNATURE----- --=-=-=--