diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2020-12-29 13:25:47 +0100 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2020-12-29 13:25:47 +0100 |
| commit | 7d440cdbfdf6f2164895d448fe3e5bfce1ce4ea2 (patch) | |
| tree | cd5959f671be7eddb57b9a083a409a000b639543 | |
| parent | 0ed631866cc0b7cece2b0a0b50e39b37ae91bb67 (diff) | |
| download | guix-7d440cdbfdf6f2164895d448fe3e5bfce1ce4ea2.tar guix-7d440cdbfdf6f2164895d448fe3e5bfce1ce4ea2.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/bootloaders.scm | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 85fe453c23..5d4b33ee4b 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")) |