tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-10 15:10:37 +02:00
Code Activity

Revert "gnu: u-boot: Fix freeze on boot with u-boot-rockpro64-rk3399."

Browse Source 
because it was applied to the wrong u-boot.

This reverts commit d980e6e275.
This commit is contained in:
Danny Milosavljevic
2020-12-29 13:25:47 +01:00
parent 0ed631866c
commit 7d440cdbfd
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/packages/bootloaders.scm
View File

@@ -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"))