From patchwork Sun May 28 09:44:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 50379 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 B8C1627BBEA; Sun, 28 May 2023 10:44:41 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham 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 C69BC27BBE2 for ; Sun, 28 May 2023 10:44:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3Cwa-0008ES-8J; Sun, 28 May 2023 05:44:08 -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 1q3CwU-0008DQ-4j for guix-patches@gnu.org; Sun, 28 May 2023 05:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q3CwT-0003JQ-T1 for guix-patches@gnu.org; Sun, 28 May 2023 05:44:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3CwT-0001bG-Po for guix-patches@gnu.org; Sun, 28 May 2023 05:44:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63766] [PATCH 1/4] gnu: bootloader: Add u-boot-sifive-unmatched-bootloader. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Sun, 28 May 2023 09:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63766 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63766@debbugs.gnu.org Cc: Efraim Flashner , ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 63766-submit@debbugs.gnu.org id=B63766.16852670246083 (code B ref 63766); Sun, 28 May 2023 09:44:01 +0000 Received: (at 63766) by debbugs.gnu.org; 28 May 2023 09:43:44 +0000 Received: from localhost ([127.0.0.1]:53291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3CwC-0001a3-01 for submit@debbugs.gnu.org; Sun, 28 May 2023 05:43:44 -0400 Received: from mail-wm1-f50.google.com ([209.85.128.50]:57840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3Cw8-0001Ze-Mo for 63766@debbugs.gnu.org; Sun, 28 May 2023 05:43:42 -0400 Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-3f606912ebaso23476915e9.3 for <63766@debbugs.gnu.org>; Sun, 28 May 2023 02:43:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685267015; x=1687859015; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=c+lyzZ2AdRbMQ3b+dXX9tNzaGHWDBbfyjxYAOOFNGn0=; b=NdmNDqfWw26f3ITytbxnYuD8xwDeE/2OzGzTvkqmSuYV0+GkvFG5IT/acqppj87K8L S4TlH9bGkVaGVzUaDOFdCy4ZBjAjwFtS2Lr/Tw7ZKBaeXClvoit3hzjT1kYe+f8OuXxi sMKHr2Hto5GgfEejpRQ7/LwubU8bjGIwTqTwTf/ub/BQI32sbR/NubjsgoVi2DDimlTj gJTL8HHhhyZ0zTzhUPKlux2R9iDriG4tZxbXPNrogYVmAfSBXBm9DiAc87+tc1CW2Rvd 5rXGnFZsT1Rr33P6TeOn6r0atY1jD0QkEjh8TxUtuvCc9eoaHUkhOPKPMEr1vLGY32Y/ SIVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685267015; x=1687859015; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=c+lyzZ2AdRbMQ3b+dXX9tNzaGHWDBbfyjxYAOOFNGn0=; b=Od+YOWqDwVCfHUhw7cJnjb4Uc1HZqXxuLsRMBqRgYJbB4N6BighkDjDTGjHltESfhw yX2Kj/5id3ZVdioFl1f/pr+IWOJ1FR2unQ/T6zqg3Ty/cCIT1okOoOcOXaUgch5UCvdi p5vesP84evkpJ9JFPuDpKGRtfvRxEStn43mfpHqRR0Nq9uWqzFKPz7cRC1xfURc/Gb+J DGOqscvTIdcMWCcJcQcmSgMYC7d+Y2nJqagmDcSeal8b0qlg2SP367wc9XXRGAlAyBwc Pr8s8Kkhuo1LUOUMeypuHbH8YC3qKYsbxKxMsYHtNRSRRnCI1jq6zlohTS1rEqq0RyXZ 3gjw== X-Gm-Message-State: AC+VfDza39MBmdqegJfm7SnqL4OQVDYC8O1oWdlNRRtGeyhOdUXntpr4 TgLbyQmBDLtRdh5iUSbDjtImEke4Px9cZA== X-Google-Smtp-Source: ACHHUZ5h6pFl8lX4Bn29mBSS7wrGOSE9xfa27HE7Ebo7IP41luC0hDBweSy4xJYQJ7PY8XLM7vWofg== X-Received: by 2002:a1c:7718:0:b0:3f4:2452:9667 with SMTP id t24-20020a1c7718000000b003f424529667mr6319487wmi.30.1685267014669; Sun, 28 May 2023 02:43:34 -0700 (PDT) Received: from localhost ([37.46.46.3]) by smtp.gmail.com with ESMTPSA id l21-20020a1c7915000000b003f603b8eb5asm10758191wme.7.2023.05.28.02.43.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 May 2023 02:43:34 -0700 (PDT) From: Efraim Flashner Date: Sun, 28 May 2023 12:44:18 +0300 Message-Id: <5085b2db36a14af32131e5024a0952d9f3e700ed.1685266344.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 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 (install-sifive-unmatched-u-boot, u-boot-sifive-unmatched-bootloader): New variables. --- gnu/bootloader/u-boot.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index 65d7923465..712db15b02 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020 Julien Lepiller ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2023 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,7 @@ (define-module (gnu bootloader u-boot) u-boot-puma-rk3399-bootloader u-boot-rock64-rk3328-bootloader u-boot-rockpro64-rk3399-bootloader + u-boot-sifive-unmatched-bootloader u-boot-ts7970-q-2g-1000mhz-c-bootloader u-boot-wandboard-bootloader)) @@ -135,6 +137,15 @@ (define install-u-boot-ts7970-q-2g-1000mhz-c-u-boot (install-dir (string-append mount-point "/boot"))) (install-file u-boot.imx install-dir)))) +(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))))) + ;;; @@ -273,3 +284,9 @@ (define u-boot-ts7970-q-2g-1000mhz-c-bootloader (package u-boot-ts7970-q-2g-1000mhz-c) (installer install-u-boot-ts7970-q-2g-1000mhz-c-u-boot) (disk-image-installer #f))) + +(define u-boot-sifive-unmatched-bootloader + (bootloader + (inherit u-boot-bootloader) + (package u-boot-sifive-unmatched) + (disk-image-installer install-sifive-unmatched-u-boot)))