[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#64149] [PATCH v4 3/5] gnu: u-boot: Add crust firmware to pinebook,
From: |
vagrant |
Subject: |
[bug#64149] [PATCH v4 3/5] gnu: u-boot: Add crust firmware to pinebook, pine64_plus and pine64-lts. |
Date: |
Wed, 19 Jul 2023 18:44:57 -0700 |
From: Vagrant Cascadian <vagrant@debian.org>
* 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.
---
gnu/packages/bootloaders.scm | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 966f1787f8..ea69fc890b 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -1010,7 +1010,7 @@ (define-public u-boot-am335x-boneblack
(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 @@ (define*-public (make-u-boot-sunxi64-package board
triplet
#~(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")))
--
2.39.2
- [bug#64149] [PATCH v4 0/5] Update U-boot to 2023.07.02., vagrant, 2023/07/19
- [bug#64149] [PATCH v4 2/5] gnu: u-boot: Update to 2023.07.02., vagrant, 2023/07/19
- [bug#64149] [PATCH v4 1/5] gnu: arm-trusted-firmware: Update to 2.9., vagrant, 2023/07/19
- [bug#64149] [PATCH v4 3/5] gnu: u-boot: Add crust firmware to pinebook, pine64_plus and pine64-lts.,
vagrant <=
- [bug#64149] [PATCH v4 5/5] gnu: patman: Add python-u-boot-pylib to inputs., vagrant, 2023/07/19
- [bug#64149] [PATCH v4 4/5] gnu: Add python-u-boot-pylib., vagrant, 2023/07/19
- [bug#64149] [PATCH v4 0/5] Update U-boot to 2023.07.02., Maxim Cournoyer, 2023/07/19