Subject: bug#45478: closed (Re: [bug#45478] [PATCH] gnu: u-boot: Fix freeze on boot with u-boot-rockpro64-rk3399)

From: [email-masked] (GNU bug Tracking System)
Date: Mon, 28 Dec 2020 18:41:02 +0000

Your bug report

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

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
45478: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=45478
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#45478] [PATCH] gnu: u-boot: Fix freeze on boot with u-boot-rockpro64-rk3399
From: Danny Milosavljevic <[email-masked]>
To: Caliph Nomble via Guix-patches via <[email-masked]>
Cc: Caliph Nomble <[email-masked]>, [email-masked]
Date: Mon, 28 Dec 2020 19:40:47 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi,

thanks for the patch!

Pushed to guix master as commit d980e6e275aed80e65ad3b7e17c5a5118661e2c2.

Subject: [PATCH] gnu: u-boot: Fix freeze on boot with u-boot-rockpro64-rk3399
From: Caliph Nomble <[email-masked]>
To: [email-masked]
Cc: Caliph Nomble <[email-masked]>
Date: Mon, 28 Dec 2020 06:00:28 +0000
List-Id: <debbugs-submit.debbugs.gnu.org>

* 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