From patchwork Sat May 18 17:43:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 X-Patchwork-Id: 27639 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0870327BBEA; Sat, 18 May 2024 18:44:39 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D2B2D27BBE2 for ; Sat, 18 May 2024 18:44:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s8O6S-0003Uh-7R; Sat, 18 May 2024 13:44:16 -0400 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 ) id 1s8O6G-0003Qo-WB for guix-patches@gnu.org; Sat, 18 May 2024 13:44:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s8O6D-0004vh-7K for guix-patches@gnu.org; Sat, 18 May 2024 13:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s8O6G-0002vJ-N7 for guix-patches@gnu.org; Sat, 18 May 2024 13:44:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70892] [PATCH v2 6/7] bootloader: Add u-boot-starfive-visionfive2-bootloader. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 May 2024 17:44:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70892 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70892@debbugs.gnu.org Received: via spool by 70892-submit@debbugs.gnu.org id=B70892.171605423511168 (code B ref 70892); Sat, 18 May 2024 17:44:04 +0000 Received: (at 70892) by debbugs.gnu.org; 18 May 2024 17:43:55 +0000 Received: from localhost ([127.0.0.1]:34700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8O63-0002tz-IO for submit@debbugs.gnu.org; Sat, 18 May 2024 13:43:55 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81]:49258 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8O5h-0002sN-1m for 70892@debbugs.gnu.org; Sat, 18 May 2024 13:43:36 -0400 Received: from m.tailaa68d.ts.net (unknown [183.247.5.112]) by APP-03 (Coremail) with SMTP id rQCowABXXpKt6Ehmk1vQCw--.11822S8; Sun, 19 May 2024 01:43:13 +0800 (CST) From: Zheng Junjie Date: Sun, 19 May 2024 01:43:03 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: rQCowABXXpKt6Ehmk1vQCw--.11822S8 X-Coremail-Antispam: 1UD129KBjvJXoWxCFy7Gw1UurWfKw1DKw45Jrb_yoW5Gr4rpF 1q9395K34kJFsxZan3XFyUCF1FqFs5XFZxZFy7Xry7XF1UZF1kZwn0vF95Xa13X3WxJryq qrW8Jr1UuF4kCr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9Ib7Iv0xC_KF4lb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUCVW8JwA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIE14v26r1j6r4UM28EF7xvwVC2z280 aVCY1x0267AKxVWUJVW8JwAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzV Aqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S 6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC20s026x CaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_ JrWlx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r 1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_ Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8Jb IYCTnIWIevJa73UjIFyTuYvjxUcuWlDUUUU X-Originating-IP: [183.247.5.112] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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)