From patchwork Mon Aug 26 14:45:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 30339 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 4696227BBEA; Mon, 26 Aug 2024 15:47:24 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 EC23527BBE2 for ; Mon, 26 Aug 2024 15:47:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1siazw-0004e3-U3; Mon, 26 Aug 2024 10:47:12 -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 1siazw-0004dN-3h for guix-patches@gnu.org; Mon, 26 Aug 2024 10:47:12 -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 1siazv-0005so-PU for guix-patches@gnu.org; Mon, 26 Aug 2024 10:47:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=oeWbLrxSKWrXU7HvcaLf4nhs7oJmGaKdHADj8tfjVho=; b=XVIiPwKq4of5VmobPF0uDWeFa9oYBE/upSqg0Tx94W9By+wtbtI12fZbBI6tKxKzEHMrF++u9Oy60aIhiyjwa3T1g9iaJ4Op9K2VjHah1YsVyIhNAJ75Lkf9KVI40CQLyUcgv77o7ZFMKeVcOsPKNl7j6DmEYfHO6iJEYdDLNtjMjoVJzmYOtvbS78qbGJEbkI867I+C+DD5Kti9L4jU/ABtpKMwTEa1cVJClDKTa9XXx+YSE2hMBCNVKhMvyMm3xffacRAy/iEnhOD5TYd6ZvYe6gKsAQ2o404Pfk7lnzWGHa2yhUXC2rkgPceCmiZqod5i++zwysxQUKdyOJfxjw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sib0k-0008Au-3X for guix-patches@gnu.org; Mon, 26 Aug 2024 10:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70131] [PATCH v2 1/8] gnu: bootloader: Add nanopi-r4s-rk3399 bootloader. References: In-Reply-To: Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Aug 2024 14:48:02 +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 Received: via spool by 70131-submit@debbugs.gnu.org id=B70131.172468362231240 (code B ref 70131); Mon, 26 Aug 2024 14:48:02 +0000 Received: (at 70131) by debbugs.gnu.org; 26 Aug 2024 14:47:02 +0000 Received: from localhost ([127.0.0.1]:45037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siazk-00087T-Rb for submit@debbugs.gnu.org; Mon, 26 Aug 2024 10:47:02 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:58375 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siazg-000871-5K for 70131@debbugs.gnu.org; Mon, 26 Aug 2024 10:47:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1724683556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oeWbLrxSKWrXU7HvcaLf4nhs7oJmGaKdHADj8tfjVho=; b=aAQTLkn9bnd2I+t8VEg8qjVAG5tgLwI5n0LI6Ke7pGQo6zJgGedDjYSuGp4+ai9j/Ed2gj /YouC3Lspb/fSRTZOYPlgYxoOfHsvNzVKbz8s+Q+B2LzMRSyBHn6YCCQO0+bi7HLOQMbiG FjI9dp3RZZUHcdcB+p4+u26EGbIGtEn91cnbL8XXPiwSAT7QG6hRc03jsiwZLgbTK7gtAJ uNoBkgUxQvkhxHluBDoJW3vecSZ3AEJJ2VR7j9ew38tSCHCa9qk/UpR3fL3Ovew2YPvHBB TiLvOfqT3/ajTm9ew3dOJ39IJ6k4vKgtkKu/8D25sqKOtbhWdZv5MSPaIiU72Q== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 0251b425 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Mon, 26 Aug 2024 14:45:56 +0000 (UTC) Date: Mon, 26 Aug 2024 16:45:00 +0200 Message-ID: <20240826144511.3770-1-herman@rimm.ee> X-Mailer: git-send-email 2.45.2 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 c5437a7b63..7888a4e030 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 ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. @@ -37,6 +37,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 @@ -98,6 +99,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")) @@ -274,6 +284,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 4072df50d7..f42d42c1c4 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 ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. @@ -1237,6 +1237,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