01/02: Revert "gnu: u-boot: Fix freeze on boot with u-boot-rockpro64-rk3399." because it was applied to the wrong u-boot.

[guix-commits]

dannym pushed a commit to branch master
in repository guix.

commit 7d440cdbfdf6f2164895d448fe3e5bfce1ce4ea2
Author: Danny Milosavljevic <dannym@scratchpost.org>
AuthorDate: Tue Dec 29 13:25:47 2020 +0100

    Revert "gnu: u-boot: Fix freeze on boot with u-boot-rockpro64-rk3399."
    because it was applied to the wrong u-boot.
    
    This reverts commit d980e6e275aed80e65ad3b7e17c5a5118661e2c2.
---
 gnu/packages/bootloaders.scm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 85fe453..5d4b33e 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -878,14 +878,7 @@ 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 '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
+              (add-after 'unpack 'set-environment
                 (lambda* (#:key inputs #:allow-other-keys)
                   (setenv "BL31" (string-append (assoc-ref inputs "firmware")
                                                 "/bl31.elf"))