diff options
| author | Caliph Nomble <calnomble@protonmail.com> | 2020-12-29 13:28:16 +0100 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2020-12-29 13:28:16 +0100 |
| commit | 219612904c005328d892aaf9737c37a91635db2a (patch) | |
| tree | bc3b584b015289db8e0b8fbe09af5330c42311cf /gnu/packages/bootloaders.scm | |
| parent | 7d440cdbfdf6f2164895d448fe3e5bfce1ce4ea2 (diff) | |
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>
Diffstat (limited to 'gnu/packages/bootloaders.scm')
| -rw-r--r-- | gnu/packages/bootloaders.scm | 9 |
1 files changed, 8 insertions, 1 deletions
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 @@ 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")) |