From patchwork Mon Apr 1 20:22:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 62435 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 A8F8027BBEA; Mon, 1 Apr 2024 21:24:11 +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=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 0CE7E27BBE2 for ; Mon, 1 Apr 2024 21:24:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrOCJ-0007Wo-FF; Mon, 01 Apr 2024 16:24:03 -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 1rrOCI-0007W9-9i for guix-patches@gnu.org; Mon, 01 Apr 2024 16:24:02 -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 1rrOCI-0006M0-1g for guix-patches@gnu.org; Mon, 01 Apr 2024 16:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrOCL-0007CN-AB; Mon, 01 Apr 2024 16:24:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70131] [PATCH 5/5] gnu: bootloader: Add orangepi-zero2w 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:05 +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.171200300227559 (code B ref 70131); Mon, 01 Apr 2024 20:24:05 +0000 Received: (at 70131) by debbugs.gnu.org; 1 Apr 2024 20:23:22 +0000 Received: from localhost ([127.0.0.1]:51622 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrOBd-0007AP-Qp for submit@debbugs.gnu.org; Mon, 01 Apr 2024 16:23:22 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:46455 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrOBa-00079F-OE for 70131@debbugs.gnu.org; Mon, 01 Apr 2024 16:23:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1712002985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kw0PXhMKG88NZJnYADM2qf6hhOBU12f1dpDlgpEp0bs=; b=Ix/GHVM2FfjRBXZhYLwuCdGjIS4REAEsyE46blIC8iQqh1vYEyk5UYxisz9R2pwuRVBQbI L8s5WjdVVbr4flxEgpthqt9+TqGLjx4E+f2EIYXUJVVFvnSzGhCn7+jvujMGHDqBFGg1iE Nke/IAYWRTxPfO4801ztvgxzTYmmj8uYxQNrrxKVhdzppEnqUrBCVnmHjj33pP4f2TW1PX mAkEl5uvvLgSUvlPR/AtlHPNFwHGWzExWqF79p3QPdME43kuryqNTtSYlp5mI0oGAVX/5k UwSA5WHAZv0ZeiLh3DNKYQmSdpA/sTTRt0wY/Ay34Y/dG2jZPkiVFGu82awhIg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 418bed71 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 1 Apr 2024 20:23:05 +0000 (UTC) Date: Mon, 1 Apr 2024 22:22:33 +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 (u-boot-orangepi-zero2w-bootloader): Add variable. * gnu/packages/bootloaders.scm (u-boot-orangepi-zero2w): Add variable. * gnu/packages/firmware.scm (arm-trusted-firmware-sun50i-h616): Add variable. Change-Id: Idb43fdabac51b3301f3bea24fec72bfa29636489 --- gnu/bootloader/u-boot.scm | 6 ++++++ gnu/packages/bootloaders.scm | 18 ++++++++++++++++++ gnu/packages/firmware.scm | 6 ++++++ 3 files changed, 30 insertions(+) diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index 4d0f7ead96..50e4563390 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -40,6 +40,7 @@ (define-module (gnu bootloader u-boot) u-boot-nintendo-nes-classic-edition-bootloader u-boot-novena-bootloader u-boot-orangepi-r1-plus-lts-rk3328-bootloader + u-boot-orangepi-zero2w-bootloader u-boot-pine64-plus-bootloader u-boot-pine64-lts-bootloader u-boot-pinebook-bootloader @@ -266,6 +267,11 @@ (define u-boot-orangepi-r1-plus-lts-rk3328-bootloader (package u-boot-orangepi-r1-plus-lts-rk3328) (disk-image-installer install-orangepi-r1-plus-lts-rk3328-u-boot))) +(define u-boot-orangepi-zero2w-bootloader + (bootloader + (inherit u-boot-allwinner-bootloader) + (package u-boot-orangepi-zero2w))) + (define u-boot-pine64-plus-bootloader (bootloader (inherit u-boot-allwinner64-bootloader) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index ae604ab5bb..829c5d3a7e 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1144,6 +1144,24 @@ (define*-public (make-u-boot-sunxi64-package board triplet scp-firmware (modify-inputs (package-inputs base) (append arm-trusted-firmware-sun50i-a64)))))) +(define-public u-boot-orangepi-zero2w + (let ((base (make-u-boot-package + "orangepi_zero2w" "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 native-inputs inputs #:allow-other-keys) + (setenv "SCP" "/dev/null") + (setenv "BL31" (search-input-file inputs "bl31.bin")))))))) + (inputs + (modify-inputs (package-inputs base) + ;; The Zero 2W uses the slightly revised Allwinner H618. + (append arm-trusted-firmware-sun50i-h616)))))) + (define-public u-boot-pine64-plus (make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu" (delay crust-pine64-plus))) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index baf96a8212..b26610267c 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1156,6 +1156,12 @@ (define-public arm-trusted-firmware-sun50i-a64 (inherit base) (name "arm-trusted-firmware-sun50i-a64")))) +(define-public arm-trusted-firmware-sun50i-h616 + (let ((base (make-arm-trusted-firmware "sun50i_h616"))) + (package + (inherit base) + (name "arm-trusted-firmware-sun50i-h616")))) + (define-public arm-trusted-firmware-rk3328 (make-arm-trusted-firmware "rk3328"))