diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-02-28 19:07:46 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-02-28 19:07:46 +0100 |
| commit | d614f0bba90c86c836131eea3ebb9cbd30f19abf (patch) | |
| tree | 22e6250fc344f86e0e356e0dcad254b95373877a /gnu/packages/bootloaders.scm | |
| parent | 7fe962788ac330fce18d7cc39f613bb1f961d6ea (diff) | |
| parent | 20c87138a9ca1bbccef2ee91589f11ec70985555 (diff) | |
| download | guix-d614f0bba90c86c836131eea3ebb9cbd30f19abf.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/bootloaders.scm')
| -rw-r--r-- | gnu/packages/bootloaders.scm | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 63a88dd7ec..770647935a 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -670,7 +670,20 @@ it fits within common partitioning schemes.") (make-u-boot-sunxi64-package "pine64-lts" "aarch64-linux-gnu")) (define-public u-boot-pinebook - (make-u-boot-sunxi64-package "pinebook" "aarch64-linux-gnu")) + (let ((base (make-u-boot-sunxi64-package "pinebook" "aarch64-linux-gnu"))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'patch-pinebook-config + ;; Fix regression with LCD video output introduced in 2020.01 + ;; https://patchwork.ozlabs.org/patch/1225130/ + (lambda _ + (substitute* "configs/pinebook_defconfig" + (("CONFIG_VIDEO_BRIDGE_ANALOGIX_ANX6345=y") "CONFIG_VIDEO_BRIDGE_ANALOGIX_ANX6345=y\nCONFIG_VIDEO_BPP32=y")) + #t))))))))) (define-public u-boot-bananapi-m2-ultra (make-u-boot-package "Bananapi_M2_Ultra" "arm-linux-gnueabihf")) |