diff options
| author | Marius Bakke <marius@gnu.org> | 2020-12-29 17:37:17 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-12-29 17:37:17 +0100 |
| commit | a22e75c073c785a3a71c952d97fb7ab87dfd282d (patch) | |
| tree | c0ef12b8c271c9de37bcce9287b67adf8628ed93 /gnu/packages/bootloaders.scm | |
| parent | bbe4ed65ed5fe7dc8ed9d226042852387cee3b1e (diff) | |
| parent | 789bf7fcc241d010cb583dc76c366110bfca8b35 (diff) | |
| download | guix-a22e75c073c785a3a71c952d97fb7ab87dfd282d.tar.gz | |
Merge branch 'master' into ungrafting
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")) |