aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/bootloaders.scm
diff options
context:
space:
mode:
authorCaliph Nomble via Guix-patches via <guix-patches@gnu.org>2020-12-28 06:00:28 +0000
committerDanny Milosavljevic <dannym@scratchpost.org>2020-12-28 19:36:38 +0100
commitd980e6e275aed80e65ad3b7e17c5a5118661e2c2 (patch)
tree8e664707b59fe21302e316dec63cfe052ecae9b8 /gnu/packages/bootloaders.scm
parent423228d3b138a8993da5dea65cb378e2f4f0a0af (diff)
downloadguix-d980e6e275aed80e65ad3b7e17c5a5118661e2c2.tar
guix-d980e6e275aed80e65ad3b7e17c5a5118661e2c2.tar.gz
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>
Diffstat (limited to 'gnu/packages/bootloaders.scm')
-rw-r--r--gnu/packages/bootloaders.scm9
1 files changed, 8 insertions, 1 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 5d4b33ee4b..85fe453c23 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"))