branch master updated: gnu: u-boot: Fix freeze on boot with u-boot-rockpro64-rk3399.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

dannym pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new d980e6e  gnu: u-boot: Fix freeze on boot with u-boot-rockpro64-rk3399.
d980e6e is described below

commit d980e6e275aed80e65ad3b7e17c5a5118661e2c2
Author: Caliph Nomble via Guix-patches via <guix-patches@gnu.org>
AuthorDate: Mon Dec 28 06:00:28 2020 +0000

    gnu: u-boot: Fix freeze on boot with u-boot-rockpro64-rk3399.
    
    * gnu/packages/bootloaders.scm 
(u-boot-rockpro64-rk3399)[arguments]<#:phases>
    [patch-rockpro64-config]: Build with modified config to prevent freeze on 
boot
    due to usb being enabled.
    
    Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
 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 5d4b33e..85fe453 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -878,7 +878,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"))