GNU bug report logs - #45478
[PATCH] gnu: u-boot: Fix freeze on boot with u-boot-rockpro64-rk3399

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 45478 in the body.
You can then email your comments to 45478 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Caliph Nomble <calnomble <at> protonmail.com>
To: guix-patches <at> gnu.org
Cc: Caliph Nomble <calnomble <at> protonmail.com>
Subject: [PATCH] gnu: u-boot: Fix freeze on boot with u-boot-rockpro64-rk3399
Date: Mon, 28 Dec 2020 06:00:28 +0000

* gnu/packages/bootloaders.scm (u-boot-rockpro64-rk3399): Build with modified
config to prevent freeze on boot due to usb being enabled.
---
 gnu/packages/bootloaders.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 7034085d67..078bc3156e 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -868,7 +868,14 @@ to Novena upstream, does not load u-boot.img from the first partition.")
         (substitute-keyword-arguments (package-arguments base)
           ((#:phases phases)
            `(modify-phases ,phases
-              (add-after 'unpack 'set-environment
+              (add-after 'unpack 'patch-rockpro64-config
+                ;; Fix regression in 2020.10 causing freezes on boot with USB boot enabled.
+                ;; See https://gitlab.manjaro.org/manjaro-arm/packages/core/uboot-rockpro64/-/issues/4
+                (lambda _
+                  (substitute* "configs/rockpro64-rk3399_defconfig"
+                    (("CONFIG_USE_PREBOOT=y") "CONFIG_USE_PREBOOT=n"))
+                  #t))
+              (add-after 'patch-rockpro64-config 'set-environment
                 (lambda* (#:key inputs #:allow-other-keys)
                   (setenv "BL31" (string-append (assoc-ref inputs "firmware")
                                                 "/bl31.elf"))
-- 
2.26.2

Message #10 received at 45478-done <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Caliph Nomble via Guix-patches via <guix-patches <at> gnu.org>
Cc: Caliph Nomble <calnomble <at> protonmail.com>, 45478-done <at> debbugs.gnu.org
Subject: Re: [bug#45478] [PATCH] gnu: u-boot: Fix freeze on boot with
 u-boot-rockpro64-rk3399
Date: Mon, 28 Dec 2020 19:40:47 +0100

[Message part 1 (text/plain, inline)]

Hi,

thanks for the patch!

Pushed to guix master as commit d980e6e275aed80e65ad3b7e17c5a5118661e2c2.

[Message part 2 (application/pgp-signature, inline)]

Message #16 received at 45478 <at> debbugs.gnu.org (full text, mbox):

From: Caliph Nomble <calnomble <at> protonmail.com>
To: "45478 <at> debbugs.gnu.org" <45478 <at> debbugs.gnu.org>
Cc: "dannym <at> scratchpost.org" <dannym <at> scratchpost.org>
Subject: Re: [bug#45478] [PATCH] gnu: u-boot: Fix freeze on boot with
 u-boot-rockpro64-rk3399
Date: Tue, 29 Dec 2020 07:23:49 +0000

Hi,

I'm sorry, but I didn't realize there were changes to gnu/packages/bootloaders.scm on master after v1.2.0, and wrote the patch based on that version. At the moment, the patch as committed to master has been applied to u-boot-firefly-rk3399, not u-boot-rockpro64-rk3399. I can submit a new patch to fix this, but I'm not sure how to handle it in regards to the changelog system?

Thanks!

Message #19 received at 45478 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Caliph Nomble <calnomble <at> protonmail.com>
Cc: "45478 <at> debbugs.gnu.org" <45478 <at> debbugs.gnu.org>
Subject: Re: [bug#45478] [PATCH] gnu: u-boot: Fix freeze on boot with
 u-boot-rockpro64-rk3399
Date: Tue, 29 Dec 2020 13:33:58 +0100

[Message part 1 (text/plain, inline)]

Hi,

thanks for the heads-up.

Reverted in guix master commit 7d440cdbfdf6f2164895d448fe3e5bfce1ce4ea2
and then fixed correctly (manually) in guix master
commit 219612904c005328d892aaf9737c37a91635db2a.

Good to know that such a thing can happen with git am.  I was of the impression
it would check the git commit ids before patching--but apparently not O_o

Thanks again.

[Message part 2 (application/pgp-signature, inline)]

Message #22 received at 45478 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Danny Milosavljevic <dannym <at> scratchpost.org>
Cc: "45478 <at> debbugs.gnu.org" <45478 <at> debbugs.gnu.org>,
 Caliph Nomble <calnomble <at> protonmail.com>
Subject: Re: [bug#45478] [PATCH] gnu: u-boot: Fix freeze on boot with
 u-boot-rockpro64-rk3399
Date: Tue, 29 Dec 2020 16:34:36 -0500

[Message part 1 (text/plain, inline)]

On Tue, Dec 29, 2020 at 01:33:58PM +0100, Danny Milosavljevic wrote:
> Hi,
> 
> thanks for the heads-up.
> 
> Reverted in guix master commit 7d440cdbfdf6f2164895d448fe3e5bfce1ce4ea2
> and then fixed correctly (manually) in guix master
> commit 219612904c005328d892aaf9737c37a91635db2a.
> 
> Good to know that such a thing can happen with git am.  I was of the impression
> it would check the git commit ids before patching--but apparently not O_o

The application of patches can be really tricky. If it can go wrong...
it will!

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.