From: Herman Rimm via Guix-patches via <guix-patches@gnu.org>
To: 74842@debbugs.gnu.org
Subject: [bug#74842] [PATCH 1/4] gnu: bootloader: u-boot: Add u-boot-rockchip-bootloader.
Date: Thu, 12 Dec 2024 22:03:25 +0100 [thread overview]
Message-ID: <6a1609d369654f967bdcb42bec27357b5f522ebf.1734037218.git.herman@rimm.ee> (raw)
* 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
next reply other threads:[~2024-12-12 21:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-12 21:03 Herman Rimm via Guix-patches via [this message]
2024-12-12 21:07 ` [bug#74842] [PATCH 2/4] gnu: bootloader: u-boot: Add write-u-boot-image procedure Herman Rimm via Guix-patches via
2024-12-12 21:07 ` [bug#74842] [PATCH 3/4] gnu: u-boot-rockpro64-rk3399: Remove obsolete substitute Herman Rimm via Guix-patches via
2024-12-12 21:07 ` [bug#74842] [PATCH 4/4] gnu: Add make-u-boot-rockchip-package procedure Herman Rimm via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6a1609d369654f967bdcb42bec27357b5f522ebf.1734037218.git.herman@rimm.ee \
--to=guix-patches@gnu.org \
--cc=74842@debbugs.gnu.org \
--cc=herman@rimm.ee \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).