From 219612904c005328d892aaf9737c37a91635db2a Mon Sep 17 00:00:00 2001 From: Caliph Nomble Date: Tue, 29 Dec 2020 13:28:16 +0100 Subject: 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 --- gnu/packages/bootloaders.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 5d4b33ee4b..9ca574a151 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -898,7 +898,14 @@ (define-public u-boot-rockpro64-rk3399 (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")) -- cgit v1.2.3