Received: (at 74842) by debbugs.gnu.org; 12 Dec 2024 21:08:23 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 12 16:08:23 2024
Received: from localhost ([127.0.0.1]:40608 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tLqPx-0000vd-Of
for submit <at> debbugs.gnu.org; Thu, 12 Dec 2024 16:08:23 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:37851
helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <herman@HIDDEN>) id 1tLqPq-0000uH-TA
for 74842 <at> debbugs.gnu.org; Thu, 12 Dec 2024 16:08:13 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
t=1734037672;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=VAGnmjtmHT+VC9H7+39P3Sv17eQJW7d3xhqqDWcE9ic=;
b=GtGoWXxFD/XUpc/7zk13bbo4lUrUwAXzYBTF3Crluul+rZonIVlEqEytuYkOgbyedxmViG
5eEC3stTxd6Ze0pL2YegYGQZw8wc2B4hLAxSjc5Uc91Ca8RzEz3guWxTiJOmZ4QN55Rhcq
RZqSW7KDHvsJr2zKmcm7EkbmyCG/NvbBMCejDSr6b3WIzCPG/8jUueOsFuN/U11mfG01K2
LMlozJD/qgRtGBRb2tc6k7ivNnAZf5K1prl4jtYErILd+i/bUhouHDa8BH0kKwA+rbeiCT
SftMZ3awA0tg8/dQ3rqfcoylat+TDTCtqLNcQ4gxSHs1ul5ku7VxM73RVmufwA==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 381b737c
(TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
for <74842 <at> debbugs.gnu.org>; Thu, 12 Dec 2024 21:07:52 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
To: 74842 <at> debbugs.gnu.org
Subject: [PATCH 4/4] gnu: Add make-u-boot-rockchip-package procedure.
Date: Thu, 12 Dec 2024 22:07:11 +0100
Message-ID: <ab45dc97fcd5f92a23e7237e8549de818e207b53.1734037218.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <6a1609d369654f967bdcb42bec27357b5f522ebf.1734037218.git.herman@HIDDEN>
References: <6a1609d369654f967bdcb42bec27357b5f522ebf.1734037218.git.herman@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Efraim Flashner <efraim@HIDDEN>,
Vagrant Cascadian <vagrant@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: * gnu/packages/bootloaders.scm
(make-u-boot-rockchip-package):
Add. (u-boot-orangepi-r1-plus-lts-rk3328, u-boot-puma-rk3399,
u-boot-rock64-rk3328,
u-boot-firefly-rk3399, u-boot-rockpro64-rk3399, u-boo [...]
Content analysis details: (3.6 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
The query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[81.205.150.117 listed in sa-accredit.habeas.com]
3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL
[81.205.150.117 listed in zen.spamhaus.org]
0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[81.205.150.117 listed in bl.score.senderscore.com]
0.0 TVD_RCVD_IP Message was received from an IP address
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
-0.0 SPF_PASS SPF: sender matches SPF record
X-Debbugs-Envelope-To: 74842
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: * gnu/packages/bootloaders.scm (make-u-boot-rockchip-package):
Add. (u-boot-orangepi-r1-plus-lts-rk3328, u-boot-puma-rk3399, u-boot-rock64-rk3328,
u-boot-firefly-rk3399, u-boot-rockpro64-rk3399, u-boo [...]
Content analysis details: (2.6 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
The query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[81.205.150.117 listed in sa-accredit.habeas.com]
3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL
[81.205.150.117 listed in zen.spamhaus.org]
0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[81.205.150.117 listed in bl.score.senderscore.com]
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
-0.0 SPF_PASS SPF: sender matches SPF record
-1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list
manager
* gnu/packages/bootloaders.scm (make-u-boot-rockchip-package): Add.
(u-boot-orangepi-r1-plus-lts-rk3328, u-boot-puma-rk3399,
u-boot-rock64-rk3328, u-boot-firefly-rk3399, u-boot-rockpro64-rk3399,
u-boot-pinebook-pro-rk3399): Use procedure.
Change-Id: I0d7632e46cfed312f8b2843c6fafc912077bc241
---
gnu/packages/bootloaders.scm | 136 +++++++++++------------------------
1 file changed, 41 insertions(+), 95 deletions(-)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 15cdaddd7e..8d3cda760a 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -18,7 +18,7 @@
;;; Copyright © 2022, 2023 Denis 'GNUtoo' Carikli <GNUtoo@HIDDEN>
;;; Copyright © 2021 Stefan <stefan-guix@HIDDEN>
;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
-;;; Copyright © 2023 Herman Rimm <herman@HIDDEN>
+;;; Copyright © 2023-2024 Herman Rimm <herman@HIDDEN>
;;; Copyright © 2023 Simon Tournier <zimon.toutoune@HIDDEN>
;;; Copyright © 2024 Zheng Junjie <873216071@HIDDEN>
;;;
@@ -1145,6 +1145,27 @@ (define*-public (make-u-boot-package board triplet
(copy-file file target-file)))
uboot-files)))))))))))
+(define* (make-u-boot-rockchip-package board soc #:optional configs)
+ "Return the U-Boot package for BOARD with AAarch64 Rockchip SOC
+(System on Chip)."
+ (let* ((board (string-append board "-" (symbol->string soc)))
+ (base (make-u-boot-package board "aarch64-linux-gnu"
+ #:configs configs))
+ (atf (match soc
+ ('rk3399 arm-trusted-firmware-rk3399)
+ ('rk3328 arm-trusted-firmware-rk3328))))
+ (package
+ (inherit base)
+ (arguments
+ (substitute-keyword-arguments (package-arguments base)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-after 'unpack 'set-environment
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((atf (assoc-ref inputs #$(package-name atf))))
+ (setenv "BL31" (string-append atf "/bl31.elf")))))))))
+ (inputs (modify-inputs (package-inputs base) (append atf))))))
+
(define-public u-boot-am335x-boneblack
(let ((base (make-u-boot-package
"am335x_evm" "arm-linux-gnueabihf"
@@ -1260,19 +1281,7 @@ (define-public u-boot-novena
partition."))
(define-public u-boot-orangepi-r1-plus-lts-rk3328
- (let ((base (make-u-boot-package "orangepi-r1-plus-lts-rk3328" "aarch64-linux-gnu")))
- (package
- (inherit base)
- (arguments
- (substitute-keyword-arguments (package-arguments base)
- ((#:phases phases)
- #~(modify-phases #$phases
- (add-after 'unpack 'set-environment
- (lambda* (#:key native-inputs inputs #:allow-other-keys)
- (setenv "BL31" (search-input-file inputs "bl31.elf"))))))))
- (inputs
- (modify-inputs (package-inputs base)
- (append arm-trusted-firmware-rk3328))))))
+ (make-u-boot-rockchip-package "orangepi-r1-plus-lts" 'rk3328))
(define-public u-boot-cubieboard
(make-u-boot-package "Cubieboard" "arm-linux-gnueabihf"))
@@ -1281,22 +1290,7 @@ (define-public u-boot-cubietruck
(make-u-boot-package "Cubietruck" "arm-linux-gnueabihf"))
(define-public u-boot-puma-rk3399
- (let ((base (make-u-boot-package "puma-rk3399" "aarch64-linux-gnu")))
- (package
- (inherit base)
- (arguments
- (substitute-keyword-arguments (package-arguments base)
- ((#:phases phases)
- #~(modify-phases #$phases
- (add-after 'unpack 'set-environment
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "BL31" (search-input-file inputs "/bl31.elf"))))
- ;; Phases do not succeed on the bl31 ELF.
- (delete 'strip)
- (delete 'validate-runpath)))))
- (inputs
- (modify-inputs (package-inputs base)
- (append arm-trusted-firmware-rk3399))))))
+ (make-u-boot-rockchip-package "puma" 'rk3399))
(define-public u-boot-qemu-arm
(make-u-boot-package "qemu_arm" "arm-linux-gnueabihf"
@@ -1417,87 +1411,39 @@ (define-public u-boot-starfive-visionfive2
(append opensbi-for-visionfive2))))))
(define-public u-boot-rock64-rk3328
- (let ((base (make-u-boot-package "rock64-rk3328" "aarch64-linux-gnu")))
- (package
- (inherit base)
- (arguments
- (substitute-keyword-arguments (package-arguments base)
- ((#:phases phases)
- #~(modify-phases #$phases
- (add-after 'unpack 'set-environment
- (lambda* (#:key native-inputs inputs #:allow-other-keys)
- (setenv "BL31" (search-input-file inputs "bl31.elf"))))))))
- (inputs
- (modify-inputs (package-inputs base)
- (append arm-trusted-firmware-rk3328))))))
+ (make-u-boot-rockchip-package "rock64" 'rk3328))
(define-public u-boot-firefly-rk3399
- (let ((base (make-u-boot-package "firefly-rk3399" "aarch64-linux-gnu")))
- (package
- (inherit base)
- (arguments
- (substitute-keyword-arguments (package-arguments base)
- ((#:phases phases)
- #~(modify-phases #$phases
- (add-after 'unpack 'set-environment
- (lambda* (#:key native-inputs inputs #:allow-other-keys)
- (setenv "BL31" (search-input-file inputs "bl31.elf"))))
- ;; Phases do not succeed on the bl31 ELF.
- (delete 'strip)
- (delete 'validate-runpath)))))
- (inputs
- (modify-inputs (package-inputs base)
- (append arm-trusted-firmware-rk3399))))))
+ (make-u-boot-rockchip-package "firefly" 'rk3399))
(define-public u-boot-rockpro64-rk3399
- (let ((base (make-u-boot-package "rockpro64-rk3399" "aarch64-linux-gnu"
- #:configs '("CONFIG_USB=y"
- "CONFIG_AHCI=y"
- "CONFIG_AHCI_PCI=y"
- "CONFIG_SATA=y"
- "CONFIG_SATA_SIL=y"
- "CONFIG_SCSI=y"
- "CONFIG_SCSI_AHCI=y"
- "CONFIG_DM_SCSI=y"
- ;; Disable SPL FIT signatures,
- ;; due to GPLv2 and Openssl
- ;; license incompatibilities
- "# CONFIG_SPL_FIT_SIGNATURE is not set"))))
+ (let ((base (make-u-boot-rockchip-package
+ "rockpro64" 'rk3399
+ '("CONFIG_USB=y"
+ "CONFIG_AHCI=y"
+ "CONFIG_AHCI_PCI=y"
+ "CONFIG_SATA=y"
+ "CONFIG_SATA_SIL=y"
+ "CONFIG_SCSI=y"
+ "CONFIG_SCSI_AHCI=y"
+ "CONFIG_DM_SCSI=y"
+ ;; Disable SPL FIT signatures, due to GPLv2 and
+ ;; OpenSSL license incompatibilities.
+ "# CONFIG_SPL_FIT_SIGNATURE is not set"))))
(package
(inherit base)
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
#~(modify-phases #$phases
- (add-after 'unpack 'set-environment
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "BL31" (search-input-file inputs "/bl31.elf"))))
(add-after 'unpack 'patch-header
(lambda _
(substitute* "include/config_distro_bootcmd.h"
(("\"scsi_need_init=")
- "\"setenv scsi_need_init"))))))))
- (inputs
- (modify-inputs (package-inputs base)
- (append arm-trusted-firmware-rk3399))))))
+ "\"setenv scsi_need_init")))))))))))
(define-public u-boot-pinebook-pro-rk3399
- (let ((base (make-u-boot-package "pinebook-pro-rk3399" "aarch64-linux-gnu")))
- (package
- (inherit base)
- (arguments
- (substitute-keyword-arguments (package-arguments base)
- ((#:phases phases)
- #~(modify-phases #$phases
- (add-after 'unpack 'set-environment
- (lambda* (#:key native-inputs inputs #:allow-other-keys)
- (setenv "BL31" (search-input-file inputs "bl31.elf"))))
- ;; Phases do not succeed on the bl31 ELF.
- (delete 'strip)
- (delete 'validate-runpath)))))
- (inputs
- (modify-inputs (package-inputs base)
- (append arm-trusted-firmware-rk3399))))))
+ (make-u-boot-rockchip-package "pinebook-pro" 'rk3399))
(define*-public (make-u-boot-bin-package u-boot-package
#:key
--
2.45.2
efraim@HIDDEN, vagrant@HIDDEN, guix-patches@HIDDEN:bug#74842; Package guix-patches.
Full text available.
Received: (at 74842) by debbugs.gnu.org; 12 Dec 2024 21:08:13 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 12 16:08:13 2024
Received: from localhost ([127.0.0.1]:40606 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tLqPt-0000vP-E1
for submit <at> debbugs.gnu.org; Thu, 12 Dec 2024 16:08:13 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:37851
helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <herman@HIDDEN>) id 1tLqPp-0000uH-UG
for 74842 <at> debbugs.gnu.org; Thu, 12 Dec 2024 16:08:10 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
t=1734037672;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=TBwp4RFg2Lq/1Gto5w8q8qSUP1OjhTWIpWA7F8Bugsw=;
b=k5PwiWP+ngA6VXOPMhfBULgzC5xVaKzZC64QEaTYI2qT0RDAh2aPLIajRv8TfJvU16gbUu
Lv9URcosnmb4olWIWaWWufJu0mjqCDJXDWg/9onFTM9gP/VOoEjEgZ7cSoYyOPEENFMjiw
rCn5wNnAeonDyXaj8rjgLLT9ZMh5Ps5y3C8QgFlZ2LXo6u/zPWKjAqXgiQ9yhg8p92NQDl
mho9LcIf9xcq8NcCAbryHHGPfVZYaEsj+xEeKGNqdrkUnM87v5IMDBm63wzg2FskABDVRj
wUgRRVzoFUELI2IZHVhFkSH4y5T57/UcI7ve4RfpEN1FJfR0PXtenVfOZD8kMQ==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 35d34c08
(TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
for <74842 <at> debbugs.gnu.org>; Thu, 12 Dec 2024 21:07:52 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
To: 74842 <at> debbugs.gnu.org
Subject: [PATCH 3/4] gnu: u-boot-rockpro64-rk3399: Remove obsolete substitute.
Date: Thu, 12 Dec 2024 22:07:10 +0100
Message-ID: <ef568fc4b9c4c51db6140f63cee0af9fda290a0b.1734037218.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <6a1609d369654f967bdcb42bec27357b5f522ebf.1734037218.git.herman@HIDDEN>
References: <6a1609d369654f967bdcb42bec27357b5f522ebf.1734037218.git.herman@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Efraim Flashner <efraim@HIDDEN>,
Vagrant Cascadian <vagrant@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: * gnu/packages/bootloaders.scm
(u-boot-rockpro64-rk3399)[arguments]:
Merge substitutes. Remove non-matching substitute. Change-Id:
I27dbc51c0eb95de9e1474c966a4e97f7cff26009
--- gnu/packages/bootloaders.scm | 22 ++ 1 file changed, 2 insertions(+),
20 deletions(-)
Content analysis details: (3.6 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
The query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[81.205.150.117 listed in sa-accredit.habeas.com]
3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL
[81.205.150.117 listed in zen.spamhaus.org]
0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[81.205.150.117 listed in bl.score.senderscore.com]
0.0 TVD_RCVD_IP Message was received from an IP address
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
-0.0 SPF_PASS SPF: sender matches SPF record
0.0 TVD_SPACE_RATIO No description available.
X-Debbugs-Envelope-To: 74842
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: * gnu/packages/bootloaders.scm (u-boot-rockpro64-rk3399)[arguments]:
Merge substitutes. Remove non-matching substitute. Change-Id: I27dbc51c0eb95de9e1474c966a4e97f7cff26009
--- gnu/packages/bootloaders.scm | 22 ++ 1 file changed, 2 insertions(+),
20 deletions(-)
Content analysis details: (2.6 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
The query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[81.205.150.117 listed in sa-accredit.habeas.com]
3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL
[81.205.150.117 listed in zen.spamhaus.org]
0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[81.205.150.117 listed in bl.score.senderscore.com]
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
-0.0 SPF_PASS SPF: sender matches SPF record
0.0 TVD_SPACE_RATIO No description available.
-1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list
manager
* gnu/packages/bootloaders.scm (u-boot-rockpro64-rk3399)[arguments]:
Merge substitutes. Remove non-matching substitute.
Change-Id: I27dbc51c0eb95de9e1474c966a4e97f7cff26009
---
gnu/packages/bootloaders.scm | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 788c7dc9ef..15cdaddd7e 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -1475,26 +1475,8 @@ (define-public u-boot-rockpro64-rk3399
(add-after 'unpack 'patch-header
(lambda _
(substitute* "include/config_distro_bootcmd.h"
- (("\"scsi_need_init=false")
- "\"setenv scsi_need_init false")
- (("#define BOOTENV_SET_SCSI_NEED_INIT \"scsi_need_init=;")
- "#define BOOTENV_SET_SCSI_NEED_INIT \"setenv scsi_need_init;"))
- (substitute* "include/configs/rockchip-common.h"
- (("#define BOOT_TARGET_DEVICES\\(func\\)")
- "
-#if CONFIG_IS_ENABLED(CMD_SCSI)
- #define BOOT_TARGET_SCSI(func) func(SCSI, scsi, 0)
-#else
- #define BOOT_TARGET_SCSI(func)
-#endif
-#define BOOT_TARGET_DEVICES(func)")
- (("BOOT_TARGET_NVME\\(func\\) \\\\")
- "\
-BOOT_TARGET_NVME(func) \\
- BOOT_TARGET_SCSI(func) \\"))))
- ;; Phases do not succeed on the bl31 ELF.
- (delete 'strip)
- (delete 'validate-runpath)))))
+ (("\"scsi_need_init=")
+ "\"setenv scsi_need_init"))))))))
(inputs
(modify-inputs (package-inputs base)
(append arm-trusted-firmware-rk3399))))))
--
2.45.2
efraim@HIDDEN, vagrant@HIDDEN, guix-patches@HIDDEN:bug#74842; Package guix-patches.
Full text available.
Received: (at 74842) by debbugs.gnu.org; 12 Dec 2024 21:08:11 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 12 16:08:11 2024
Received: from localhost ([127.0.0.1]:40603 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tLqPq-0000v4-Au
for submit <at> debbugs.gnu.org; Thu, 12 Dec 2024 16:08:11 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:37851
helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <herman@HIDDEN>) id 1tLqPm-0000uH-7a
for 74842 <at> debbugs.gnu.org; Thu, 12 Dec 2024 16:08:09 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
t=1734037671;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=NQU/7gsM9r12YHNgXaYibpEq2xn/NSq/OiBjd4dy32I=;
b=NsanLdv6irU7OnmIjoTJ5EXVq5PgTs5WSZiP3uye4pkOEfZIPoSy2dzpsMK/zfm0bhrcZX
O3iXRCmabFL/9Kz5KbuMDmC75i5WQt7/lU27qPS/rLi7VRnu+QdpuWh8iZxD/kdiBpjm54
MRKoTKzcyFr/F5VZjbLATWJDRg4B3w0TBZPJTyhKOFCcaMAhDnJt7i5MygWE8avyhKQx4n
n8dtXL9/AOjtcTnWv8roqsL/p3Rh97ZA+hQKQKZfAen77+9P+BtmuYfgYIg6OQIHshgaVA
x7+w8Zag2njK8eUpbFnuLyOyTxA+Ry5KnBbX9wRQudTyMeygbC1AAJrWnAKDMQ==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id f8d8cfb7
(TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
for <74842 <at> debbugs.gnu.org>; Thu, 12 Dec 2024 21:07:51 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
To: 74842 <at> debbugs.gnu.org
Subject: [PATCH 2/4] gnu: bootloader: u-boot: Add write-u-boot-image procedure.
Date: Thu, 12 Dec 2024 22:07:09 +0100
Message-ID: <adf0881c40af75083672b79df37d74f7de023b03.1734037218.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <6a1609d369654f967bdcb42bec27357b5f522ebf.1734037218.git.herman@HIDDEN>
References: <6a1609d369654f967bdcb42bec27357b5f522ebf.1734037218.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: * gnu/bootloader/u-boot.scm (write-u-boot-image): Add
procedure.
(install-beaglebone-black-u-boot, install-allwinner-u-boot,
install-allwinner64-u-boot,
install-imx-u-boot, install-puma-rk3399-u-boot, [...]
Content analysis details: (3.6 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.0 TVD_RCVD_IP Message was received from an IP address
0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
The query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[81.205.150.117 listed in sa-trusted.bondedsender.org]
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
-0.0 SPF_PASS SPF: sender matches SPF record
3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL
[81.205.150.117 listed in zen.spamhaus.org]
0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[81.205.150.117 listed in bl.score.senderscore.com]
X-Debbugs-Envelope-To: 74842
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: * gnu/bootloader/u-boot.scm (write-u-boot-image): Add procedure.
(install-beaglebone-black-u-boot, install-allwinner-u-boot, install-allwinner64-u-boot,
install-imx-u-boot, install-puma-rk3399-u-boot, [...]
Content analysis details: (2.6 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
The query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[81.205.150.117 listed in sa-accredit.habeas.com]
3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL
[81.205.150.117 listed in zen.spamhaus.org]
0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[81.205.150.117 listed in bl.score.senderscore.com]
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
-0.0 SPF_PASS SPF: sender matches SPF record
-1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list
manager
* gnu/bootloader/u-boot.scm (write-u-boot-image): Add procedure.
(install-beaglebone-black-u-boot, install-allwinner-u-boot,
install-allwinner64-u-boot, install-imx-u-boot,
install-puma-rk3399-u-boot, install-rockchip-u-boot,
install-sifive-unmatched-u-boot, install-starfive-visionfive2-u-boot):
Use write-u-boot-image.
Change-Id: Icb73534bfc5b9ab7c8874176f649c29275c388cf
---
gnu/bootloader/u-boot.scm | 84 ++++++++++++++-------------------------
1 file changed, 29 insertions(+), 55 deletions(-)
diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm
index 5ea5f418b4..5d5fc1bff2 100644
--- a/gnu/bootloader/u-boot.scm
+++ b/gnu/bootloader/u-boot.scm
@@ -66,6 +66,22 @@ (define (make-u-boot-installer file)
(let ((install-dir (string-append mount-point "/boot")))
#$@file))))
+(define (write-u-boot-image files block-size)
+ "FILES is a list of (FILE COUNT OFFSET) tuples. Each FILE is written
+to the target image at BLOCK-SIZE * OFFSET. The number of bytes written
+is BLOCK-SIZE * COUNT, or FILE size if COUNT is not given."
+ (define (write-file-to-image file)
+ (match file
+ ((file count ... offset)
+ (let* ((file #~(string-append bootloader "/libexec/" #$file))
+ (size (match count
+ (() #~(stat:size (stat #$file)))
+ ((count) (* count block-size)))))
+ #~(write-file-on-device #$file #$size image
+ #$(* offset block-size))))))
+ #~(lambda (bootloader _ image)
+ #$@(map write-file-to-image files)))
+
(define install-u-boot
#~(lambda (bootloader root-index image)
(if bootloader
@@ -78,75 +94,33 @@ (define install-beaglebone-black-u-boot
;; the MLO and is expected at 0x60000. Write both first stage ("MLO") and
;; second stage ("u-boot.img") images, read in BOOTLOADER directory, to the
;; specified DEVICE.
- #~(lambda (bootloader root-index image)
- (let ((mlo (string-append bootloader "/libexec/MLO"))
- (u-boot (string-append bootloader "/libexec/u-boot.img")))
- (write-file-on-device mlo (* 256 512)
- image (* 256 512))
- (write-file-on-device u-boot (* 1024 512)
- image (* 768 512)))))
+ (write-u-boot-image '(("MLO" 256 256) ("u-boot.img" 768 1024)) 512))
(define install-allwinner-u-boot
- #~(lambda (bootloader root-index image)
- (let ((u-boot (string-append bootloader
- "/libexec/u-boot-sunxi-with-spl.bin")))
- (write-file-on-device u-boot (stat:size (stat u-boot))
- image (* 8 1024)))))
+ (write-u-boot-image '(("u-boot-sunxi-with-spl.bin" 8)) 1024))
(define install-allwinner64-u-boot
- #~(lambda (bootloader root-index image)
- (let ((spl (string-append bootloader "/libexec/u-boot-sunxi-with-spl.bin"))
- (u-boot (string-append bootloader "/libexec/u-boot-sunxi-with-spl.fit.itb")))
- (write-file-on-device spl (stat:size (stat spl))
- image (* 8 1024))
- (write-file-on-device u-boot (stat:size (stat u-boot))
- image (* 40 1024)))))
+ (write-u-boot-image '(("u-boot-sunxi-with-spl.bin" 8)
+ ("u-boot-sunxi-with-spl.fit.itb" 40))
+ 1024))
(define install-imx-u-boot
- #~(lambda (bootloader root-index image)
- (let ((spl (string-append bootloader "/libexec/SPL"))
- (u-boot (string-append bootloader "/libexec/u-boot.img")))
- (write-file-on-device spl (stat:size (stat spl))
- image (* 1 1024))
- (write-file-on-device u-boot (stat:size (stat u-boot))
- image (* 69 1024)))))
+ (write-u-boot-image '(("SPL" 1) ("u-boot.img" 69)) 1024))
(define install-puma-rk3399-u-boot
- #~(lambda (bootloader root-index image)
- (let ((spl (string-append bootloader "/libexec/idbloader.img"))
- (u-boot (string-append bootloader "/libexec/u-boot.itb")))
- (write-file-on-device spl (stat:size (stat spl))
- image (* 64 512))
- (write-file-on-device u-boot (stat:size (stat u-boot))
- image (* 512 512)))))
+ (write-u-boot-image '(("idbloader.img" 64) ("u-boot.itb" 512)) 512))
(define install-rockchip-u-boot
- #~(lambda (bootloader root-index image)
- (let ((idb (string-append bootloader "/libexec/idbloader.img"))
- (u-boot (string-append bootloader "/libexec/u-boot.itb")))
- (write-file-on-device idb (stat:size (stat idb))
- image (* 64 512))
- (write-file-on-device u-boot (stat:size (stat u-boot))
- image (* 16384 512)))))
+ (write-u-boot-image '(("idbloader.img" 64) ("u-boot.itb" 16384)) 512))
(define install-sifive-unmatched-u-boot
- #~(lambda (bootloader root-index image)
- (let ((spl (string-append bootloader "/libexec/spl/u-boot-spl.bin"))
- (u-boot (string-append bootloader "/libexec/u-boot.itb")))
- (write-file-on-device spl (stat:size (stat spl))
- image (* 34 512))
- (write-file-on-device u-boot (stat:size (stat u-boot))
- image (* 2082 512)))))
+ (write-u-boot-image '(("spl/u-boot-spl.bin" 34) ("u-boot.itb" 2082))
+ 512))
(define install-starfive-visionfive2-u-boot
- #~(lambda (bootloader root-index image)
- (let ((spl (string-append
- bootloader "/libexec/spl/u-boot-spl.bin.normal.out"))
- (u-boot (string-append bootloader "/libexec/u-boot.itb")))
- (write-file-on-device spl (stat:size (stat spl))
- image (* 34 512))
- (write-file-on-device u-boot (stat:size (stat u-boot))
- image (* 2082 512)))))
+ (write-u-boot-image '(("spl/u-boot-spl.bin.normal.out" 34)
+ ("u-boot.itb" 2082))
+ 512))
(define install-starfive-visionfive2-uEnv.txt
(make-u-boot-installer
--
2.45.2
guix-patches@HIDDEN:bug#74842; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 12 Dec 2024 21:04:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 12 16:04:33 2024
Received: from localhost ([127.0.0.1]:40588 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tLqML-0000i2-4V
for submit <at> debbugs.gnu.org; Thu, 12 Dec 2024 16:04:33 -0500
Received: from lists.gnu.org ([209.51.188.17]:39832)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <herman@HIDDEN>) id 1tLqMI-0000ht-VQ
for submit <at> debbugs.gnu.org; Thu, 12 Dec 2024 16:04:31 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <herman@HIDDEN>) id 1tLqMC-0004Dx-Gd
for guix-patches@HIDDEN; Thu, 12 Dec 2024 16:04:24 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]
helo=email.rimm.ee)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256)
(Exim 4.90_1) (envelope-from <herman@HIDDEN>) id 1tLqM4-0005kV-Dn
for guix-patches@HIDDEN; Thu, 12 Dec 2024 16:04:21 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
t=1734037448;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding;
bh=+sMDLqsxe3IewEti51PKD1ULoF1TwcdbjnRstFfB/hg=;
b=VOZjLIurRsvWILnkGdPCtlKMbHSOs9iHhL51mOjQzm3QtxUg6eD1pqwJWxYOMaYnZbeyV+
KwmW/DU4vkTENKp5JDIr8Z0NbN0eA9iMa4XPisXC8blzku0PZah7k03x3GJTdy2xLDj+Pt
Upi0Xh9YEiOya17wXW45Nai7QcW15VtKT7beDChlNUyIjbRJrA5l50xbtbFP5pVoERIIeW
BqGOh7kxDxpdvVXBN9AQodEeNWeG+xhMmDYxzoiAtwkCF4ZGb4yHsjnCQ0rg+SfpTUi/Vl
Lr5r60dmE0hHP7Ef6cBLEfwfDk7pEfkHBajd8rRKmWUgq6vpYrtDyO+q7QQ7cA==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 37d05986
(TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
for <guix-patches@HIDDEN>; Thu, 12 Dec 2024 21:04:08 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH 1/4] gnu: bootloader: u-boot: Add u-boot-rockchip-bootloader.
Date: Thu, 12 Dec 2024 22:03:25 +0100
Message-ID: <6a1609d369654f967bdcb42bec27357b5f522ebf.1734037218.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@HIDDEN;
helo=email.rimm.ee
X-Spam_score_int: 12
X-Spam_score: 1.2
X-Spam_bar: +
X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,
DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_PBL=3.335,
RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
TVD_RCVD_IP=0.001 autolearn=no autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.4 (-)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.4 (--)
* gnu/bootloader/u-boot.scm (install-rockchip-u-boot): Add procedure.
(install-orangepi-r1-plus-lts-rk3328-u-boot,
install-firefly-rk3399-u-boot, install-rock64-rk3328-u-boot,
install-rockpro64-rk3399-u-boot, install-pinebook-pro-rk3399-u-boot):
Remove procedure.
(u-boot-rockchip-bootloader): Add variable.
(u-boot-firefly-rk3399-bootloader,
u-boot-orangepi-r1-plus-lts-rk3328-bootloader,
u-boot-rock64-rk3328-bootloader, u-boot-rockpro64-rk3399-bootloader,
u-boot-pinebook-pro-rk3399-bootloader): Inherit
u-boot-rockchip-bootloader.
[disk-image-installer]: Remove.
Change-Id: Icb7546ee2bb1742c12c7b47ff2779d278dd45b14
---
gnu/bootloader/u-boot.scm | 66 ++++++++++-----------------------------
1 file changed, 17 insertions(+), 49 deletions(-)
diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm
index 5e149eaea0..5ea5f418b4 100644
--- a/gnu/bootloader/u-boot.scm
+++ b/gnu/bootloader/u-boot.scm
@@ -111,15 +111,6 @@ (define install-imx-u-boot
(write-file-on-device u-boot (stat:size (stat u-boot))
image (* 69 1024)))))
-(define install-orangepi-r1-plus-lts-rk3328-u-boot
- #~(lambda (bootloader root-index image)
- (let ((idb (string-append bootloader "/libexec/idbloader.img"))
- (u-boot (string-append bootloader "/libexec/u-boot.itb")))
- (write-file-on-device idb (stat:size (stat idb))
- image (* 64 512))
- (write-file-on-device u-boot (stat:size (stat u-boot))
- image (* 16384 512)))))
-
(define install-puma-rk3399-u-boot
#~(lambda (bootloader root-index image)
(let ((spl (string-append bootloader "/libexec/idbloader.img"))
@@ -129,25 +120,7 @@ (define install-puma-rk3399-u-boot
(write-file-on-device u-boot (stat:size (stat u-boot))
image (* 512 512)))))
-(define install-firefly-rk3399-u-boot
- #~(lambda (bootloader root-index image)
- (let ((idb (string-append bootloader "/libexec/idbloader.img"))
- (u-boot (string-append bootloader "/libexec/u-boot.itb")))
- (write-file-on-device idb (stat:size (stat idb))
- image (* 64 512))
- (write-file-on-device u-boot (stat:size (stat u-boot))
- image (* 16384 512)))))
-
-(define install-rock64-rk3328-u-boot
- #~(lambda (bootloader root-index image)
- (let ((idb (string-append bootloader "/libexec/idbloader.img"))
- (u-boot (string-append bootloader "/libexec/u-boot.itb")))
- (write-file-on-device idb (stat:size (stat idb))
- image (* 64 512))
- (write-file-on-device u-boot (stat:size (stat u-boot))
- image (* 16384 512)))))
-
-(define install-rockpro64-rk3399-u-boot
+(define install-rockchip-u-boot
#~(lambda (bootloader root-index image)
(let ((idb (string-append bootloader "/libexec/idbloader.img"))
(u-boot (string-append bootloader "/libexec/u-boot.itb")))
@@ -156,8 +129,6 @@ (define install-rockpro64-rk3399-u-boot
(write-file-on-device u-boot (stat:size (stat u-boot))
image (* 16384 512)))))
-(define install-pinebook-pro-rk3399-u-boot install-rockpro64-rk3399-u-boot)
-
(define install-sifive-unmatched-u-boot
#~(lambda (bootloader root-index image)
(let ((spl (string-append bootloader "/libexec/spl/u-boot-spl.bin"))
@@ -219,6 +190,12 @@ (define u-boot-imx-bootloader
(inherit u-boot-bootloader)
(disk-image-installer install-imx-u-boot)))
+(define u-boot-rockchip-bootloader
+ ;; SD and eMMC use the same format
+ (bootloader
+ (inherit u-boot-bootloader)
+ (disk-image-installer install-rockchip-u-boot)))
+
(define u-boot-nintendo-nes-classic-edition-bootloader
(bootloader
(inherit u-boot-allwinner-bootloader)
@@ -250,11 +227,9 @@ (define u-boot-cubietruck-bootloader
(package u-boot-cubietruck)))
(define u-boot-firefly-rk3399-bootloader
- ;; SD and eMMC use the same format
(bootloader
- (inherit u-boot-bootloader)
- (package u-boot-firefly-rk3399)
- (disk-image-installer install-firefly-rk3399-u-boot)))
+ (inherit u-boot-rockchip-bootloader)
+ (package u-boot-firefly-rk3399)))
(define u-boot-mx6cuboxi-bootloader
(bootloader
@@ -273,9 +248,8 @@ (define u-boot-novena-bootloader
(define u-boot-orangepi-r1-plus-lts-rk3328-bootloader
(bootloader
- (inherit u-boot-bootloader)
- (package u-boot-orangepi-r1-plus-lts-rk3328)
- (disk-image-installer install-orangepi-r1-plus-lts-rk3328-u-boot)))
+ (inherit u-boot-rockchip-bootloader)
+ (package u-boot-orangepi-r1-plus-lts-rk3328)))
(define u-boot-pine64-plus-bootloader
(bootloader
@@ -299,25 +273,19 @@ (define u-boot-puma-rk3399-bootloader
(disk-image-installer install-puma-rk3399-u-boot)))
(define u-boot-rock64-rk3328-bootloader
- ;; SD and eMMC use the same format
(bootloader
- (inherit u-boot-bootloader)
- (package u-boot-rock64-rk3328)
- (disk-image-installer install-rock64-rk3328-u-boot)))
+ (inherit u-boot-rockchip-bootloader)
+ (package u-boot-rock64-rk3328)))
(define u-boot-rockpro64-rk3399-bootloader
- ;; SD and eMMC use the same format
(bootloader
- (inherit u-boot-bootloader)
- (package u-boot-rockpro64-rk3399)
- (disk-image-installer install-rockpro64-rk3399-u-boot)))
+ (inherit u-boot-rockchip-bootloader)
+ (package u-boot-rockpro64-rk3399)))
(define u-boot-pinebook-pro-rk3399-bootloader
- ;; SD and eMMC use the same format
(bootloader
- (inherit u-boot-bootloader)
- (package u-boot-pinebook-pro-rk3399)
- (disk-image-installer install-pinebook-pro-rk3399-u-boot)))
+ (inherit u-boot-rockchip-bootloader)
+ (package u-boot-pinebook-pro-rk3399)))
(define u-boot-ts7970-q-2g-1000mhz-c-bootloader
;; This bootloader doesn't really need to be installed, as it is read from
base-commit: a9003b8e6b40b59c9545ae87bb441d3549630db7
--
2.45.2
Herman Rimm <herman@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#74842; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.