From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id wDKBBPxgPGYZRAAAe85BDQ:P1 (envelope-from ) for ; Thu, 09 May 2024 07:37:00 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id wDKBBPxgPGYZRAAAe85BDQ (envelope-from ) for ; Thu, 09 May 2024 07:37:00 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b="RGhc/Ko6"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1715233019; h=from:from:sender:sender:reply-to: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:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=rFjWgmfjcFIdjswwCsdqk1DYgY15I4efEg/rTRNbSy0=; b=fOW04fhJBTy06F9NMU5u9WUtqp+tavvNsiq5WuHVCcSUPPH8XfBq6knZLlgX/Nvvjrh7nj IWjZ7H8Efyz0k3NLZUTsNFJrY7hxzWpcBMOEFHyrby0KzX4740yfdehCxH6BNk6U6lZIIi V/OOJXtwMOb4YXxM/kY1NV3b9WNLYtlsVZnJ/sNDhpw2JAW3ZdsmQ6YvwBhSTvPb0vdsZx oYxqEKwTWq4nLXc0ic4W0K2BRNv8GlGLgxAVDbaBviyoajxKui+cUZQVhN5vej6SOSDROk WVHzrts7phFpekHH6XJ8FdtKQ3l2KtjNIGaTffZuxjBOMlHexXT2p9AQEAO9Rw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1715233019; a=rsa-sha256; cv=none; b=KaYwLrySaclvQkrrwGu5dz/B2AzbtUgwRIv4tgt96jWdKKNRYwrQcypiVHM+S1ExtHBsXo YGrX7YYcuAj0UgNY49wLix9v4B69L8n88FapSKNxLkegi++aT8ze7XCaPnted44ppKmC8p PnqMMdTtNJXyadkZRk7aFdkZwxplJZLjN6WcT+rn882BkADFsonCfZtTTAJLfwy/umC82+ aN1wJ/ZM9fzal4/pGaChg+vqyXeLH3yD+OtuNbXUgmPi6tBQyXry/B9dDRimul2igvW3r+ o9PwmZW3Wg/qf0WGoGcOxx4CmnP0K0tR/JcWJnrRg/wdzQJ0TrVGeH67oYPj0g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b="RGhc/Ko6"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8708A9A0D for ; Thu, 09 May 2024 07:36:59 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s4wSX-0003AY-6q; Thu, 09 May 2024 01:36:49 -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 1s4wSL-000346-Rx for guix-patches@gnu.org; Thu, 09 May 2024 01:36:37 -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 1s4wSL-0002Eg-Jy for guix-patches@gnu.org; Thu, 09 May 2024 01:36:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s4wSk-00039r-NA; Thu, 09 May 2024 01:37:02 -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: Thu, 09 May 2024 05:37: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 Cc: Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 70131-submit@debbugs.gnu.org id=B70131.171523299012100 (code B ref 70131); Thu, 09 May 2024 05:37:02 +0000 Received: (at 70131) by debbugs.gnu.org; 9 May 2024 05:36:30 +0000 Received: from localhost ([127.0.0.1]:53085 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4wSD-00038v-RW for submit@debbugs.gnu.org; Thu, 09 May 2024 01:36:30 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:59381 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4wS6-00038P-8M for 70131@debbugs.gnu.org; Thu, 09 May 2024 01:36:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1715232945; 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: in-reply-to:in-reply-to:references:references; bh=rFjWgmfjcFIdjswwCsdqk1DYgY15I4efEg/rTRNbSy0=; b=RGhc/Ko60sbY7i2FtuRqLmBeb/sWZl5V5SsoYKGAN+Wd9NyaSa7d6NkcloRDlBeLUW1b6U MzV4KsNlnRUb6EC4m4il+HC1ibxM+503CKIT3EwUVLjz4I43G5v8TWNstYfRUT+uPD4ITk WPuuWzhsmcZZf/K7vsDRdzkrJ9OUfO8doV3arpqmGY9WTPCHZeu0hFNFIg7ZJYEQiozrIv WfwgXBuZmLb3MgXYwwu7reCDK4cxIr09IpPwcg6HqFBqI2KITN8qi6kVZ4hPFc2GlVbGRT cTQCiKKNyWpvaU3uTVcyOL5OJJIajoQImg+346Y1of+gkizEQfIhdKhsCTPaQg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id f7fea16b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Thu, 9 May 2024 05:35:45 +0000 (UTC) Date: Thu, 9 May 2024 07:35:26 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 From: Herman Rimm via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -3.89 X-Spam-Score: -3.89 X-Migadu-Queue-Id: 8708A9A0D X-Migadu-Scanner: mx11.migadu.com X-TUID: Rg+nQsWSkGkV * 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 8e7cc05191..0b00afbe78 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 @@ -97,6 +98,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")) @@ -252,6 +262,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 -- 2.41.0