Package: guix-patches;
Reported by: Herman Rimm <herman <at> rimm.ee>
Date: Thu, 12 Dec 2024 21:05:04 UTC
Severity: normal
Tags: patch
Done: Vagrant Cascadian <vagrant <at> debian.org>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 74842 in the body.
You can then email your comments to 74842 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#74842; Package guix-patches.
(Thu, 12 Dec 2024 21:05:05 GMT) Full text and rfc822 format available.Herman Rimm <herman <at> rimm.ee>:guix-patches <at> gnu.org.
(Thu, 12 Dec 2024 21:05:05 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Herman Rimm <herman <at> rimm.ee> To: guix-patches <at> gnu.org Subject: [PATCH 1/4] gnu: bootloader: u-boot: Add u-boot-rockchip-bootloader. Date: Thu, 12 Dec 2024 22:03:25 +0100
* 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
guix-patches <at> gnu.org:bug#74842; Package guix-patches.
(Thu, 12 Dec 2024 21:09:02 GMT) Full text and rfc822 format available.Message #8 received at 74842 <at> debbugs.gnu.org (full text, mbox):
From: Herman Rimm <herman <at> rimm.ee> 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
* 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
efraim <at> flashner.co.il, vagrant <at> debian.org, guix-patches <at> gnu.org:bug#74842; Package guix-patches.
(Thu, 12 Dec 2024 21:09:02 GMT) Full text and rfc822 format available.Message #11 received at 74842 <at> debbugs.gnu.org (full text, mbox):
From: Herman Rimm <herman <at> rimm.ee> 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
* 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 <at> flashner.co.il, vagrant <at> debian.org, guix-patches <at> gnu.org:bug#74842; Package guix-patches.
(Thu, 12 Dec 2024 21:09:03 GMT) Full text and rfc822 format available.Message #14 received at 74842 <at> debbugs.gnu.org (full text, mbox):
From: Herman Rimm <herman <at> rimm.ee> 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
* 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 <at> cyberdimension.org>
;;; Copyright © 2021 Stefan <stefan-guix <at> vodafonemail.de>
;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
-;;; Copyright © 2023 Herman Rimm <herman <at> rimm.ee>
+;;; Copyright © 2023-2024 Herman Rimm <herman <at> rimm.ee>
;;; Copyright © 2023 Simon Tournier <zimon.toutoune <at> gmail.com>
;;; Copyright © 2024 Zheng Junjie <873216071 <at> qq.com>
;;;
@@ -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
Vagrant Cascadian <vagrant <at> debian.org>:Herman Rimm <herman <at> rimm.ee>:Message #19 received at 74842-done <at> debbugs.gnu.org (full text, mbox):
From: Vagrant Cascadian <vagrant <at> debian.org> To: Herman Rimm <herman <at> rimm.ee> Cc: 74842-done <at> debbugs.gnu.org Subject: Re: [bug#74842] [PATCH 1/4] gnu: bootloader: u-boot: Add u-boot-rockchip-bootloader. Date: Tue, 04 Mar 2025 10:35:14 -0800
[Message part 1 (text/plain, inline)]
Pushed series as: ae30bf6332fe42e146ae3f950fa88d6e48afcfda gnu: Add make-u-boot-rockchip-package procedure. 7edd5fdf23db4704d51f3f0b54175bed694e7e62 gnu: u-boot-rockpro64-rk3399: Remove obsolete substitute. 5196b49756ca2d21f16c2abd8ca8d91163c4b13e gnu: bootloader: u-boot: Add write-u-boot-image procedure. 498e0557c56d84a46065f61fef320478577e30fb gnu: bootloader: u-boot: Add u-boot-rockchip-bootloader. And added one more further simplifying u-boot-rockpro64-rk3399: c1ec9e8d53da209ba1d6f8466d03180d195d7334 gnu: u-boot-rockpro64-rk3399: Drop obsolete phase. Marking as done. live well, vagrant
[signature.asc (application/pgp-signature, inline)]
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Wed, 02 Apr 2025 11:24:24 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.