me
/
guix
Archived
1
0
Fork 0
Code

gnu: u-boot: Add crust firmware to pinebook, pine64_plus and pine64-lts. 

* gnu/packages/bootloaders.scm (make-u-boot-sunxi64-package): Take argument
for System Control Processor (SCP) firmware.
[native-inputs]: Add SCP firmware.
[phases]: Adjust 'set-environment to also set SCP variable.
(u-boot-pine64-plus, u-boot-pine64-lts, u-boot-pinebook): Pass appropriate
crust firmware as the SCP firmware.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Vagrant Cascadian 2021-05-11 21:15:15 +00:00
parent b0d47d9e18
commit ed5dc3a25d
No known key found for this signature in database
GPG Key ID: DC518FC87F9716AA
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/bootloaders.scm
View File

@ -1010,7 +1010,7 @@ removed so that it fits within common partitioning schemes.")))
(define-public u-boot-am335x-evm
(make-u-boot-package "am335x_evm" "arm-linux-gnueabihf"))
(define*-public (make-u-boot-sunxi64-package board triplet
(define*-public (make-u-boot-sunxi64-package board triplet scp-firmware
#:key defconfig configs)
(let ((base (make-u-boot-package
board triplet #:defconfig defconfig #:configs configs)))
@ -1022,23 +1022,27 @@ removed so that it fits within common partitioning schemes.")))
#~(modify-phases #$phases
(add-after 'unpack 'set-environment
(lambda* (#:key native-inputs inputs #:allow-other-keys)
;; Avoid dependency on crust-firmware
;; https://issues.guix.gnu.org/48371
(setenv "SCP" "/dev/null")
(setenv "SCP" (search-input-file
native-inputs "libexec/scp.bin"))
(setenv "BL31" (search-input-file inputs "bl31.bin"))))))))
(native-inputs
(modify-inputs (package-native-inputs base)
(append scp-firmware)))
(inputs
(modify-inputs (package-inputs base)
(append arm-trusted-firmware-sun50i-a64))))))
(define-public u-boot-pine64-plus
(make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu"))
(make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu"
crust-pine64-plus))
(define-public u-boot-pine64-lts
(make-u-boot-sunxi64-package "pine64-lts" "aarch64-linux-gnu"))
(make-u-boot-sunxi64-package "pine64-lts" "aarch64-linux-gnu"
crust-pine64-plus))
(define-public u-boot-pinebook
(make-u-boot-sunxi64-package
"pinebook" "aarch64-linux-gnu"
"pinebook" "aarch64-linux-gnu" crust-pinebook
;; Fix regression with LCD video output introduced in 2020.01
;; https://patchwork.ozlabs.org/patch/1225130/
#:configs '("CONFIG_VIDEO_BPP32=y")))