From patchwork Mon Apr 1 20:22:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 62438 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 4C26E27BBE9; Mon, 1 Apr 2024 21:24:35 +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,URIBL_BLOCKED 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 7626427BBE2 for ; Mon, 1 Apr 2024 21:24:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrOCI-0007WD-DW; Mon, 01 Apr 2024 16:24:02 -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 1rrOCG-0007Vb-Bc for guix-patches@gnu.org; Mon, 01 Apr 2024 16:24:00 -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 1rrOCG-0006LU-36 for guix-patches@gnu.org; Mon, 01 Apr 2024 16:24:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrOCJ-0007Bg-81; Mon, 01 Apr 2024 16:24:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70131] [PATCH 1/5] gnu: bootloader: Add nanopi-r4s-rk3399 bootloader. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Mon, 01 Apr 2024 20:24:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70131 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70131@debbugs.gnu.org Cc: Herman Rimm , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 70131-submit@debbugs.gnu.org id=B70131.171200299727511 (code B ref 70131); Mon, 01 Apr 2024 20:24:03 +0000 Received: (at 70131) by debbugs.gnu.org; 1 Apr 2024 20:23:17 +0000 Received: from localhost ([127.0.0.1]:51611 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrOBY-00079b-KG for submit@debbugs.gnu.org; Mon, 01 Apr 2024 16:23:17 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:37241 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrOBV-000796-FX for 70131@debbugs.gnu.org; Mon, 01 Apr 2024 16:23:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1712002982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ixenLnnKGVtiu/FaqltwO/UnR5stIDOEhMBUyu2ytAE=; b=oT2Veze/xEKitkOtGVH77wu8Zz4AHDvQWP+xxBnHwyw7ZKfBldFzly8dOMb96lJBSqrLjd x8c3+kSadhYxqIlHwkVPubZgF9cjWVId/Y3BMWJEhMEv4VZUA2g9JrfRM5dngiyC/GmXnj +oTFPRk8fjs8adR4RVretKxFkQBHaLW6joeAxRw2U1MCO7CDq6IqCTn2GyyYHYGhjP+r5w OFGqKRS5sq3XBjbBPFmpuUSe66aJjkUDSSK5Jo1FEHkzPRIHpvyjg5GUN0+kAsJPmKB9CM FSm+jUTC7pMdiqLbPDHj4DSr5thra9dRUvfKdjzxZAdmd6OyfAbKIxfaIPalKw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 8471e8c4 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 1 Apr 2024 20:23:02 +0000 (UTC) Date: Mon, 1 Apr 2024 22:22:29 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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-nanopi-r4s-rk3399-u-boot, u-boot-nanopi-r4s-rk3399-bootloader): Add variable. * gnu/packages/bootloaders.scm (u-boot-nanopi-r4s-rk3399): Add variable. Change-Id: I6d4cb098727fe4027aea33a39c59d34000dfc4db --- gnu/bootloader/u-boot.scm | 18 +++++++++++++++++- gnu/packages/bootloaders.scm | 17 ++++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index d20aabd538..4d0f7ead96 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2023 Efraim Flashner -;;; Copyright © 2023 Herman Rimm +;;; Copyright © 2023-2024 Herman Rimm ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,6 +36,7 @@ (define-module (gnu bootloader u-boot) u-boot-cubietruck-bootloader u-boot-firefly-rk3399-bootloader u-boot-mx6cuboxi-bootloader + u-boot-nanopi-r4s-rk3399-bootloader u-boot-nintendo-nes-classic-edition-bootloader u-boot-novena-bootloader u-boot-orangepi-r1-plus-lts-rk3328-bootloader @@ -95,6 +96,15 @@ (define install-imx-u-boot (write-file-on-device u-boot (stat:size (stat u-boot)) image (* 69 1024))))) +(define install-nanopi-r4s-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 (* 16384 512))))) + (define install-orangepi-r1-plus-lts-rk3328-u-boot #~(lambda (bootloader root-index image) (let ((idb (string-append bootloader "/libexec/idbloader.img")) @@ -244,6 +254,12 @@ (define u-boot-novena-bootloader (inherit u-boot-imx-bootloader) (package u-boot-novena))) +(define u-boot-nanopi-r4s-rk3399-bootloader + (bootloader + (inherit u-boot-bootloader) + (package u-boot-nanopi-r4s-rk3399) + (disk-image-installer install-nanopi-r4s-rk3399-u-boot))) + (define u-boot-orangepi-r1-plus-lts-rk3328-bootloader (bootloader (inherit u-boot-bootloader) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index cfe8046731..d1bf0fcd98 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2022, 2023 Denis 'GNUtoo' Carikli ;;; Copyright © 2021 Stefan ;;; Copyright © 2022, 2023 Maxim Cournoyer -;;; Copyright © 2023 Herman Rimm +;;; Copyright © 2023-2024 Herman Rimm ;;; ;;; This file is part of GNU Guix. ;;; @@ -1210,6 +1210,21 @@ (define-public u-boot-novena version, contrary to Novena upstream, does not load u-boot.img from the first partition.")) +(define-public u-boot-nanopi-r4s-rk3399 + (let ((base (make-u-boot-package "nanopi-r4s-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")))))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-rk3399)))))) + (define-public u-boot-orangepi-r1-plus-lts-rk3328 (let ((base (make-u-boot-package "orangepi-r1-plus-lts-rk3328" "aarch64-linux-gnu"))) (package