unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
To: 70892@debbugs.gnu.org
Subject: [bug#70892] [PATCH v2 6/7] bootloader: Add u-boot-starfive-visionfive2-bootloader.
Date: Sun, 19 May 2024 01:43:03 +0800	[thread overview]
Message-ID: <cc16a61410bab4946836e2b4ddcda65bf57ffa59.1716054087.git.zhengjunjie@iscas.ac.cn> (raw)
In-Reply-To: <cover.1716054087.git.zhengjunjie@iscas.ac.cn>

* gnu/bootloader/u-boot.scm (u-boot-starfive-visionfive2-bootloader): New variable.

Change-Id: I4b73906fe18d481644102c271f5e0883167b3a50
---
 gnu/bootloader/u-boot.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm
index 8e7cc05191..c5437a7b63 100644
--- a/gnu/bootloader/u-boot.scm
+++ b/gnu/bootloader/u-boot.scm
@@ -49,6 +49,7 @@ (define-module (gnu bootloader u-boot)
             u-boot-rockpro64-rk3399-bootloader
             u-boot-sifive-unmatched-bootloader
             u-boot-qemu-riscv64-bootloader
+            u-boot-starfive-visionfive2-bootloader
             u-boot-ts7970-q-2g-1000mhz-c-bootloader
             u-boot-wandboard-bootloader))
 
@@ -159,6 +160,27 @@ (define install-sifive-unmatched-u-boot
         (write-file-on-device u-boot (stat:size (stat u-boot))
                               image (* 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)))))
+
+(define install-starfive-visionfive2-uEnv.txt
+  #~(lambda (bootloader device mount-point)
+      (mkdir-p (string-append mount-point "/boot"))
+      (call-with-output-file (string-append mount-point "/boot/uEnv.txt")
+        (lambda (port)
+          (format port
+                  ;; if board SPI use vender's u-boot, will find
+                  ;; ""starfive/starfive_visionfive2.dtb"", We cannot guarantee
+                  ;; that users will update this u-boot, so set it.
+                  "fdtfile=starfive/jh7110-starfive-visionfive-2-v1.3b.dtb~%")))))
+
 (define install-qemu-riscv64-u-boot
   #~(lambda (bootloader device mount-point)
       (let ((u-boot.bin (string-append bootloader "/libexec/u-boot.bin"))
@@ -316,6 +338,13 @@ (define u-boot-sifive-unmatched-bootloader
    (package u-boot-sifive-unmatched)
    (disk-image-installer install-sifive-unmatched-u-boot)))
 
+(define u-boot-starfive-visionfive2-bootloader
+  (bootloader
+   (inherit u-boot-bootloader)
+   (package u-boot-starfive-visionfive2)
+   (installer install-starfive-visionfive2-uEnv.txt)
+   (disk-image-installer install-starfive-visionfive2-u-boot)))
+
 (define u-boot-qemu-riscv64-bootloader
   (bootloader
    (inherit u-boot-bootloader)
-- 
2.41.0





  parent reply	other threads:[~2024-05-18 17:44 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-12 11:00 [bug#70892] [PATCH 0/6] Add visionfive2 support Zheng Junjie
2024-05-12 11:09 ` [bug#70892] [PATCH 1/6] gnu: linux-libre-6.8: add riscv config Zheng Junjie
2024-05-12 11:09 ` [bug#70892] [PATCH 2/6] image: raise error when use both grub-efi* bootloader and not gpt image Zheng Junjie
2024-05-12 11:09 ` [bug#70892] [PATCH 3/6] gnu: shepherd-0.10: When target riscv64, use guile-fibers-1.1 Zheng Junjie
2024-05-12 11:09 ` [bug#70892] [PATCH 4/6] gnu: Add u-boot-starfive-visionfive2 Zheng Junjie
2024-05-15 17:59   ` Vagrant Cascadian
2024-05-18 17:58     ` Zheng Junjie
2024-05-12 11:09 ` [bug#70892] [PATCH 5/6] bootloader: Add u-boot-starfive-visionfive2-bootloader Zheng Junjie
2024-05-12 11:09 ` [bug#70892] [PATCH 6/6] system: images: Add visionfive2 module Zheng Junjie
2024-05-15 18:02 ` [bug#70892] [PATCH 0/6] Add visionfive2 support Vagrant Cascadian
2024-05-18 17:42 ` [bug#70892] [PATCH v2 0/7] " Zheng Junjie
2024-05-18 17:42   ` [bug#70892] [PATCH v2 1/7] gnu: linux-libre-6.8: add riscv config Zheng Junjie
2024-05-19 10:42     ` 宋文武 via Guix-patches via
2024-05-18 17:42   ` [bug#70892] [PATCH v2 2/7] image: raise error when use both grub-efi* bootloader and not gpt image Zheng Junjie
2024-05-18 17:43   ` [bug#70892] [PATCH v2 3/7] gnu: shepherd-0.10: When target riscv64, use guile-fibers-1.1 Zheng Junjie
2024-05-18 17:43   ` [bug#70892] [PATCH v2 4/7] gnu: Add opensbi-for-visionfive2 Zheng Junjie
2024-05-19 10:38     ` 宋文武 via Guix-patches via
2024-05-18 17:43   ` [bug#70892] [PATCH v2 5/7] gnu: Add u-boot-starfive-visionfive2 Zheng Junjie
2024-05-18 17:43   ` Zheng Junjie [this message]
2024-05-18 17:43   ` [bug#70892] [PATCH v2 7/7] system: images: Add visionfive2 module Zheng Junjie
2024-05-19  9:33     ` 宋文武 via Guix-patches via
2024-05-19 14:15 ` [bug#70892] [PATCH v3 0/7] Add visionfive2 support Zheng Junjie
2024-05-19 14:15   ` [bug#70892] [PATCH v3 1/7] gnu: linux-libre-6.8: Add riscv config Zheng Junjie
2024-05-19 14:15   ` [bug#70892] [PATCH v3 2/7] image: Raise error when use both grub-efi* bootloader and not gpt image Zheng Junjie
2024-05-19 14:15   ` [bug#70892] [PATCH v3 3/7] gnu: shepherd-0.10: When target riscv64, use guile-fibers-1.1 Zheng Junjie
2024-05-19 14:15   ` [bug#70892] [PATCH v3 4/7] gnu: Add opensbi-for-visionfive2 Zheng Junjie
2024-05-19 14:15   ` [bug#70892] [PATCH v3 5/7] gnu: Add u-boot-starfive-visionfive2 Zheng Junjie
2024-05-19 14:15   ` [bug#70892] [PATCH v3 6/7] bootloader: Add u-boot-starfive-visionfive2-bootloader Zheng Junjie
2024-05-19 14:15   ` [bug#70892] [PATCH v3 7/7] system: images: Add visionfive2 module Zheng Junjie
2024-05-22  3:22   ` bug#70892: [PATCH v3 0/7] Add visionfive2 support Z572

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=cc16a61410bab4946836e2b4ddcda65bf57ffa59.1716054087.git.zhengjunjie@iscas.ac.cn \
    --to=zhengjunjie@iscas.ac.cn \
    --cc=70892@debbugs.gnu.org \
    /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).