mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-22 02:07:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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>
This commit is contained in:
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 @@ (define-public u-boot-am335x-boneblack
(define-public u-boot-am335x-evm (define-public u-boot-am335x-evm
(make-u-boot-package "am335x_evm" "arm-linux-gnueabihf")) (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) #:key defconfig configs)
(let ((base (make-u-boot-package (let ((base (make-u-boot-package
board triplet #:defconfig defconfig #:configs configs))) board triplet #:defconfig defconfig #:configs configs)))
@ -1022,23 +1022,27 @@ (define*-public (make-u-boot-sunxi64-package board triplet
#~(modify-phases #$phases #~(modify-phases #$phases
(add-after 'unpack 'set-environment (add-after 'unpack 'set-environment
(lambda* (#:key native-inputs inputs #:allow-other-keys) (lambda* (#:key native-inputs inputs #:allow-other-keys)
;; Avoid dependency on crust-firmware (setenv "SCP" (search-input-file
;; https://issues.guix.gnu.org/48371 native-inputs "libexec/scp.bin"))
(setenv "SCP" "/dev/null")
(setenv "BL31" (search-input-file inputs "bl31.bin")))))))) (setenv "BL31" (search-input-file inputs "bl31.bin"))))))))
(native-inputs
(modify-inputs (package-native-inputs base)
(append scp-firmware)))
(inputs (inputs
(modify-inputs (package-inputs base) (modify-inputs (package-inputs base)
(append arm-trusted-firmware-sun50i-a64)))))) (append arm-trusted-firmware-sun50i-a64))))))
(define-public u-boot-pine64-plus (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 (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 (define-public u-boot-pinebook
(make-u-boot-sunxi64-package (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 ;; Fix regression with LCD video output introduced in 2020.01
;; https://patchwork.ozlabs.org/patch/1225130/ ;; https://patchwork.ozlabs.org/patch/1225130/
#:configs '("CONFIG_VIDEO_BPP32=y"))) #:configs '("CONFIG_VIDEO_BPP32=y")))