me
/
guix
Archived
1
0
Fork 0

gnu: u-boot-rockpro64-rk3399: Fix freeze on boot.

* 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>
master
Caliph Nomble 2020-12-29 13:28:16 +01:00 committed by Danny Milosavljevic
parent 7d440cdbfd
commit 219612904c
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 8 additions and 1 deletions

View File

@ -898,7 +898,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"))