From patchwork Thu May 9 05:35:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 27202 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 2093C27BBEA; Thu, 9 May 2024 06:37:00 +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 366D827BBE2 for ; Thu, 9 May 2024 06:36:59 +0100 (BST) 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 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 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 From patchwork Thu May 9 05:35:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 27201 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 3F3F527BBE2; Thu, 9 May 2024 06:36:57 +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 57BD827BBE9 for ; Thu, 9 May 2024 06:36:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s4wSN-00034V-Ma; Thu, 09 May 2024 01:36:41 -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-00033z-Kp 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-0002EX-Cz 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 1s4wSl-00039z-5x; Thu, 09 May 2024 01:37:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70131] [PATCH 2/5] gnu: u-boot: Use DDR3 patch for Nano Pi R4S. 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: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: Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 70131-submit@debbugs.gnu.org id=B70131.171523299112106 (code B ref 70131); Thu, 09 May 2024 05:37:03 +0000 Received: (at 70131) by debbugs.gnu.org; 9 May 2024 05:36:31 +0000 Received: from localhost ([127.0.0.1]:53087 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4wSE-000397-RD for submit@debbugs.gnu.org; Thu, 09 May 2024 01:36:31 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:39425 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4wS7-00038Q-4n 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=1715232946; 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=XHCyCMOM+yL+Xy76nOjxLmAKvZcJ+o5HW/hkt+2wlLE=; b=pTBQeoqv+ezKD3Onh3muQpYPKLJg7kMjg0lXiHAJuGJiqMLqLG1KSfbJeKcID/SblBHifa 8aCF7GHXmR3gbHAtYY90HmIEePMF2tUrRk4g64IRjzokv5AxCmOwZA0ZtcJuyrWAOb2yFV 7UiHHDjC7IazH823uIWhHYfOQtQ2xcY/jqBh8pWD0UfEN/hwt6g5uG6Nv2zOnklpyGbexB RfAR38IiadkwGli39QKCHW0keOmwjo5QEgtMKls3ppT/m7EXVGrD4+Yo4X98nbT4TPvPt4 uWkWxCYOBeRFBGvnOMxTUKNZgoeSthYs4l+UuD9OxVbbDJeNpeLF+1gquC/aLg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 951b55b5 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Thu, 9 May 2024 05:35:46 +0000 (UTC) Date: Thu, 9 May 2024 07:35:27 +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/packages/bootloaders.scm (%u-boot-nanopi-r4s-ddr3-patch): Add variable. (u-boot)[source]: Use patch. * gnu/packages/patches/u-boot-nanopi-r4s-ddr3.patch: Add file. * gnu/local.mk (dist_patch_DATA): Register patch. Change-Id: Ibbf952f2806c9cac7fc29e1264d427bf6ee67d01 --- gnu/local.mk | 3 ++- gnu/packages/bootloaders.scm | 7 +++++- .../patches/u-boot-nanopi-r4s-ddr3.patch | 25 +++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/u-boot-nanopi-r4s-ddr3.patch diff --git a/gnu/local.mk b/gnu/local.mk index edd546f81d..9b3e80de08 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -62,7 +62,7 @@ # Copyright © 2023 B. Wilson # Copyright © 2023 Bruno Victal # Copyright © 2023 gemmaro -# Copyright © 2023 Herman Rimm +# Copyright © 2023-2024 Herman Rimm # Copyright © 2023 Troy Figiel # Copyright © 2024 David Elsing # @@ -2134,6 +2134,7 @@ dist_patch_DATA = \ %D%/packages/patches/u-boot-build-without-libcrypto.patch \ %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ %D%/packages/patches/u-boot-rockchip-inno-usb.patch \ + %D%/packages/patches/u-boot-nanopi-r4s-ddr3.patch \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/ultrastar-deluxe-no-freesans.patch \ %D%/packages/patches/ungoogled-chromium-extension-search-path.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index d1bf0fcd98..9443de0a1d 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -720,6 +720,10 @@ (define %u-boot-build-without-libcrypto-patch ;; Upstream commit to fix Amlogic builds in u-boot 2024.01. (search-patch "u-boot-build-without-libcrypto.patch")) +(define %u-boot-nanopi-r4s-ddr3-patch + ;; Use DDR3 instead of LPDDR4 for the Nano Pi R4S U-boot. + (search-patch "u-boot-nanopi-r4s-ddr3.patch")) + (define u-boot (package (name "u-boot") @@ -728,7 +732,8 @@ (define u-boot (patches (list %u-boot-rockchip-inno-usb-patch %u-boot-build-without-libcrypto-patch - %u-boot-allow-disabling-openssl-patch)) + %u-boot-allow-disabling-openssl-patch + %u-boot-nanopi-r4s-ddr3-patch)) (method url-fetch) (uri (string-append "https://ftp.denx.de/pub/u-boot/" diff --git a/gnu/packages/patches/u-boot-nanopi-r4s-ddr3.patch b/gnu/packages/patches/u-boot-nanopi-r4s-ddr3.patch new file mode 100644 index 0000000000..3c4f5efaf4 --- /dev/null +++ b/gnu/packages/patches/u-boot-nanopi-r4s-ddr3.patch @@ -0,0 +1,25 @@ +diff --git a/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi +index 69800cc368..a3054849f8 100644 +--- a/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi ++++ b/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi +@@ -13,7 +13,7 @@ + */ + + #include "rk3399-nanopi4-u-boot.dtsi" +-#include "rk3399-sdram-lpddr4-100.dtsi" ++#include "rk3399-sdram-ddr3-1866.dtsi" + + / { + smbios { +diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig +index 4f4363cb0f..bfa7ee628d 100644 +--- a/configs/nanopi-r4s-rk3399_defconfig ++++ b/configs/nanopi-r4s-rk3399_defconfig +@@ -54,7 +54,6 @@ CONFIG_PMIC_RK8XX=y + CONFIG_REGULATOR_PWM=y + CONFIG_REGULATOR_RK8XX=y + CONFIG_PWM_ROCKCHIP=y +-CONFIG_RAM_ROCKCHIP_LPDDR4=y + CONFIG_BAUDRATE=1500000 + CONFIG_DEBUG_UART_SHIFT=2 + CONFIG_SYS_NS16550_MEM32=y From patchwork Thu May 9 05:35:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 27205 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 DCEC627BBE9; Thu, 9 May 2024 06:37:26 +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 4490127BBE2 for ; Thu, 9 May 2024 06:37:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s4wSd-0003FN-Cx; Thu, 09 May 2024 01:36:55 -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 1s4wSN-00034X-6a for guix-patches@gnu.org; Thu, 09 May 2024 01:36:39 -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 1s4wSM-0002F3-TN for guix-patches@gnu.org; Thu, 09 May 2024 01:36:38 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s4wSm-0003AS-Mq; Thu, 09 May 2024 01:37:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70131] [PATCH 3/5] gnu: firmware: Update make-arm-trusted-firmware to 2.10. 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:04 +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.171523299412127 (code B ref 70131); Thu, 09 May 2024 05:37:04 +0000 Received: (at 70131) by debbugs.gnu.org; 9 May 2024 05:36:34 +0000 Received: from localhost ([127.0.0.1]:53093 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4wSH-00039S-TH for submit@debbugs.gnu.org; Thu, 09 May 2024 01:36:34 -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 1s4wSA-00038P-Ma for 70131@debbugs.gnu.org; Thu, 09 May 2024 01:36:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1715232947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CDh6j/gyRQJu/bWyCEU2h6TQ6bA8h4XUw+81pomrxGs=; b=lWNkgj2ZqxGRRoFDOO7m9iXTZ11ILIrYGs7TooGymyW931CQ/fsIZwGleP0rLY75zpUyWr UMJkVNC7FGikfW6ZDCM8lUzth13x+5x4zXF+9aUv3SC4KTmze5AhUkdrSLtTivdQrpEeZk 8/gnRF7pyFdaAxKCtx6ujc/yPObweBdTy1pGEOtO85dKZ6TX45UC4Th1KTufy4HuLRUVKe 8zg/8dmGcxC8ESepMf8+BHQ4cQMTwohQyOszMXONNoUEe6nLOu0AF17u9jQdLQdo5I8/T2 yxZHoOYqq0mrbr1mwDfvdBGXKZmO9Htjy3BLD2K7gNkNO3ZBEXEt962EYPswLQ== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id d92a56a3 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Thu, 9 May 2024 05:35:47 +0000 (UTC) Date: Thu, 9 May 2024 07:35:28 +0200 Message-ID: <4817968672bc992f40ecd7d71aa4c0491c6a0591.1715232797.git.herman@rimm.ee> 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/packages/firmware.scm(make-arm-trusted-firmware): Update to 2.10. --- gnu/packages/firmware.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 6f0c2da806..d155c5365c 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1094,18 +1094,17 @@ (define* (make-arm-trusted-firmware platform (gnu-triplet->nix-system triplet)))))) (package (name (string-append "arm-trusted-firmware-" platform)) - (version "2.9") + (version "2.10") (source (origin (method git-fetch) (uri (git-reference - ;; There are only GitHub generated release snapshots. (url "https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/") (commit (string-append "v" version)))) (file-name (git-file-name "arm-trusted-firmware" version)) (sha256 (base32 - "16fjbn1zck0d8b554h8lk1svqqn0zlawvrlkjxry9l71s9h4vd0p")) + "099r2c5vnvl83c2saca615dryr1byj2nm6imzkg5ix4kajsry2q8")) (snippet #~(begin (use-modules (guix build utils)) From patchwork Thu May 9 05:35:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 27204 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 A756E27BBEA; Thu, 9 May 2024 06:37:17 +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 3AE8327BBE2 for ; Thu, 9 May 2024 06:37:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s4wSg-0003Il-50; Thu, 09 May 2024 01:36:58 -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 1s4wSN-00034Y-Ih for guix-patches@gnu.org; Thu, 09 May 2024 01:36:39 -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 1s4wSN-0002FB-9H for guix-patches@gnu.org; Thu, 09 May 2024 01:36:39 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s4wSl-0003AC-LT; Thu, 09 May 2024 01:37:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70131] [PATCH 4/5] gnu: u-boot: Update to 2024.04. 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: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: Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 70131-submit@debbugs.gnu.org id=B70131.171523299312114 (code B ref 70131); Thu, 09 May 2024 05:37:03 +0000 Received: (at 70131) by debbugs.gnu.org; 9 May 2024 05:36:33 +0000 Received: from localhost ([127.0.0.1]:53089 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4wSG-00039J-Kj for submit@debbugs.gnu.org; Thu, 09 May 2024 01:36:33 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:39425 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4wSA-00038Q-VB for 70131@debbugs.gnu.org; Thu, 09 May 2024 01:36:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1715232949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XXA7lonaghx23xHRbXLLBQUM5kZYaf3gtCx3vKGC3zY=; b=GZNBt6aZbxinXHYCemcbolMtWHPt+jlhIEU90t6EsAV9/JNQ5DXWFNpf2hepeM5GLkxTSR ic165VcBCXL78mpdbV97mc2Gd195dXFZ2Qqwy4cMI/WMHJhVCJruJhPUZFBGdanv6F6W73 bG/f9+mKHx2ieZSy15SgRzEzCvEQa57yw6SvhCeWZ4k39ECQkwPgv4lecypsLM5aoiNNjh quJhBWv/dbuhMQs+g7i43XExHZwyLKKwFSuqL1iw7F2eC/e+IF/+qwZlUNWA0V26jearQI zqnsOBJm1dgaj6Kr1BKSO2dxgYqDMRnXPzO+r1QPyumpdm/KdQTHaYN4ZIfxmw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 1e63421e (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Thu, 9 May 2024 05:35:49 +0000 (UTC) Date: Thu, 9 May 2024 07:35:29 +0200 Message-ID: <6d05b45249b85dea55e1ab3d4df5158731bad734.1715232797.git.herman@rimm.ee> 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/packages/bootloaders.scm (u-boot): Update to 2024.04. [source]: Remove build-without-libcrypto patch. (%u-boot-build-without-libcrypto-patch): Remove variable. (u-boot-tools)[arguments]: Disable sandbox tests and kwbimage. * gnu/packages/patches/u-boot-build-without-libcrypto.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove patch. Change-Id: I85863adb0324461fabf164d3e936d922ade3aa69 --- gnu/local.mk | 1 - gnu/packages/bootloaders.scm | 26 ++-- .../u-boot-build-without-libcrypto.patch | 123 ------------------ 3 files changed, 13 insertions(+), 137 deletions(-) delete mode 100644 gnu/packages/patches/u-boot-build-without-libcrypto.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9b3e80de08..4b22196acb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2131,7 +2131,6 @@ dist_patch_DATA = \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/twinkle-bcg729.patch \ %D%/packages/patches/u-boot-allow-disabling-openssl.patch \ - %D%/packages/patches/u-boot-build-without-libcrypto.patch \ %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ %D%/packages/patches/u-boot-rockchip-inno-usb.patch \ %D%/packages/patches/u-boot-nanopi-r4s-ddr3.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 9443de0a1d..a6ba4b14da 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -716,10 +716,6 @@ (define %u-boot-allow-disabling-openssl-patch ;; https://lists.denx.de/pipermail/u-boot/2021-October/462728.html (search-patch "u-boot-allow-disabling-openssl.patch")) -(define %u-boot-build-without-libcrypto-patch - ;; Upstream commit to fix Amlogic builds in u-boot 2024.01. - (search-patch "u-boot-build-without-libcrypto.patch")) - (define %u-boot-nanopi-r4s-ddr3-patch ;; Use DDR3 instead of LPDDR4 for the Nano Pi R4S U-boot. (search-patch "u-boot-nanopi-r4s-ddr3.patch")) @@ -727,11 +723,10 @@ (define %u-boot-nanopi-r4s-ddr3-patch (define u-boot (package (name "u-boot") - (version "2024.01") + (version "2024.04") (source (origin (patches (list %u-boot-rockchip-inno-usb-patch - %u-boot-build-without-libcrypto-patch %u-boot-allow-disabling-openssl-patch %u-boot-nanopi-r4s-ddr3-patch)) (method url-fetch) @@ -740,7 +735,7 @@ (define u-boot "u-boot-" version ".tar.bz2")) (sha256 (base32 - "1czmpszalc6b8cj9j7q6cxcy19lnijv3916w3dag6yr3xpqi35mr")))) + "0jnx8f45101b971zmpimjyk6vvgab8kx9hhcm41svmzs77z57a0q")))) (build-system gnu-build-system) (native-inputs (list bison @@ -837,9 +832,11 @@ (define-public u-boot-tools (("\\./tools/patman/patman") (which "true")) ;; FIXME: test fails, needs further investiation (("run_test \"binman\"") "# run_test \"binman\"") - ;; FIXME: test_spl fails, needs further investiation - (("test_ofplatdata or test_handoff or test_spl") - "test_ofplatdata or test_handoff") + ;; FIXME: tests fail without kwbimage, i.e. openssl. + (("run_test \"sandbox_noinst\"") + "# run_test \"sandbox_noinst\"") + (("run_test \"sandbox_vpl\"") + "# run_test \"sandbox_vpl\"") ;; FIXME: code coverage not working (("run_test \"binman code coverage\"") "# run_test \"binman code coverage\"") @@ -862,14 +859,16 @@ (define-public u-boot-tools (("CONFIG_FIT_SIGNATURE=y") "CONFIG_FIT_SIGNATURE=n CONFIG_UT_LIB_ASN1=n -CONFIG_TOOLS_LIBCRYPTO=n") +CONFIG_TOOLS_LIBCRYPTO=n +CONFIG_TOOLS_KWBIMAGE=n") ;; Catch instances of implied CONFIG_FIG_SIGNATURE ;; with VPL targets (("CONFIG_SANDBOX_VPL=y") "CONFIG_SANDBOX_VPL=y CONFIG_FIT_SIGNATURE=n CONFIG_VPL_FIT_SIGNATURE=n -CONFIG_TOOLS_LIBCRYPTO=n") +CONFIG_TOOLS_LIBCRYPTO=n +CONFIG_TOOLS_KWBIMAGE=n") ;; This test requires a sound system, which is un-used ;; in u-boot-tools. (("CONFIG_SOUND=y") "CONFIG_SOUND=n"))) @@ -1071,7 +1070,8 @@ (define*-public (make-u-boot-package board triplet (lambda _ (substitute* ".config" (("CONFIG_TOOLS_LIBCRYPTO=.*$") - "CONFIG_TOOLS_LIBCRYPTO=n")))) + "CONFIG_TOOLS_LIBCRYPTO=n +CONFIG_TOOLS_KWBIMAGE=n")))) (replace 'install (lambda _ (let ((libexec (string-append #$output "/libexec")) diff --git a/gnu/packages/patches/u-boot-build-without-libcrypto.patch b/gnu/packages/patches/u-boot-build-without-libcrypto.patch deleted file mode 100644 index d56588941c..0000000000 --- a/gnu/packages/patches/u-boot-build-without-libcrypto.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 03e598263e3878b6f5d58f5525577903edadc644 Mon Sep 17 00:00:00 2001 -From: Paul-Erwan Rio -Date: Thu, 21 Dec 2023 08:26:11 +0100 -Subject: [PATCH] tools: fix build without LIBCRYPTO support - -Commit cb9faa6f98ae ("tools: Use a single target-independent config to -enable OpenSSL") introduced a target-independent configuration to build -crypto features in host tools. - -But since commit 2c21256b27d7 ("hash: Use Kconfig to enable hashing in -host tools and SPL") the build without OpenSSL is broken, due to FIT -signature/encryption features. Add missing conditional compilation -tokens to fix this. - -Signed-off-by: Paul-Erwan Rio -Tested-by: Alexander Dahl -Cc: Simon Glass -Reviewed-by: Tom Rini -Reviewed-by: Simon Glass ---- - include/image.h | 2 +- - tools/Kconfig | 1 + - tools/fit_image.c | 2 +- - tools/image-host.c | 4 ++++ - tools/mkimage.c | 5 +++-- - 5 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/include/image.h b/include/image.h -index 432ec927b1..21de70f0c9 100644 ---- a/include/image.h -+++ b/include/image.h -@@ -1465,7 +1465,7 @@ int calculate_hash(const void *data, int data_len, const char *algo, - * device - */ - #if defined(USE_HOSTCC) --# if defined(CONFIG_FIT_SIGNATURE) -+# if CONFIG_IS_ENABLED(FIT_SIGNATURE) - # define IMAGE_ENABLE_SIGN 1 - # define FIT_IMAGE_ENABLE_VERIFY 1 - # include -diff --git a/tools/Kconfig b/tools/Kconfig -index f8632cd59d..f01ed783e6 100644 ---- a/tools/Kconfig -+++ b/tools/Kconfig -@@ -51,6 +51,7 @@ config TOOLS_FIT_RSASSA_PSS - Support the rsassa-pss signature scheme in the tools builds - - config TOOLS_FIT_SIGNATURE -+ depends on TOOLS_LIBCRYPTO - def_bool y - help - Enable signature verification of FIT uImages in the tools builds -diff --git a/tools/fit_image.c b/tools/fit_image.c -index 71e031c855..beef1fa86e 100644 ---- a/tools/fit_image.c -+++ b/tools/fit_image.c -@@ -61,7 +61,7 @@ static int fit_add_file_data(struct image_tool_params *params, size_t size_inc, - ret = fit_set_timestamp(ptr, 0, time); - } - -- if (!ret) -+ if (CONFIG_IS_ENABLED(FIT_SIGNATURE) && !ret) - ret = fit_pre_load_data(params->keydir, dest_blob, ptr); - - if (!ret) { -diff --git a/tools/image-host.c b/tools/image-host.c -index ca4950312f..90bc9f905f 100644 ---- a/tools/image-host.c -+++ b/tools/image-host.c -@@ -14,8 +14,10 @@ - #include - #include - -+#if CONFIG_IS_ENABLED(FIT_SIGNATURE) - #include - #include -+#endif - - /** - * fit_set_hash_value - set hash value in requested has node -@@ -1131,6 +1133,7 @@ static int fit_config_add_verification_data(const char *keydir, - return 0; - } - -+#if CONFIG_IS_ENABLED(FIT_SIGNATURE) - /* - * 0) open file (open) - * 1) read certificate (PEM_read_X509) -@@ -1239,6 +1242,7 @@ int fit_pre_load_data(const char *keydir, void *keydest, void *fit) - out: - return ret; - } -+#endif - - int fit_cipher_data(const char *keydir, void *keydest, void *fit, - const char *comment, int require_keys, -diff --git a/tools/mkimage.c b/tools/mkimage.c -index 6dfe3e1d42..ac62ebbde9 100644 ---- a/tools/mkimage.c -+++ b/tools/mkimage.c -@@ -115,7 +115,7 @@ static void usage(const char *msg) - " -B => align size in hex for FIT structure and header\n" - " -b => append the device tree binary to the FIT\n" - " -t => update the timestamp in the FIT\n"); --#ifdef CONFIG_FIT_SIGNATURE -+#if CONFIG_IS_ENABLED(FIT_SIGNATURE) - fprintf(stderr, - "Signing / verified boot options: [-k keydir] [-K dtb] [ -c ] [-p addr] [-r] [-N engine]\n" - " -k => set directory containing private keys\n" -@@ -130,8 +130,9 @@ static void usage(const char *msg) - " -o => algorithm to use for signing\n"); - #else - fprintf(stderr, -- "Signing / verified boot not supported (CONFIG_FIT_SIGNATURE undefined)\n"); -+ "Signing / verified boot not supported (CONFIG_TOOLS_FIT_SIGNATURE undefined)\n"); - #endif -+ - fprintf(stderr, " %s -V ==> print version information and exit\n", - params.cmdname); - fprintf(stderr, "Use '-T list' to see a list of available image types\n"); --- -2.41.0 - From patchwork Thu May 9 05:35:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 27203 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 B030927BBE9; Thu, 9 May 2024 06:37:07 +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 5405827BBE2 for ; Thu, 9 May 2024 06:37:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s4wSZ-0003D2-1B; Thu, 09 May 2024 01:36:51 -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 1s4wSO-00034g-Bh for guix-patches@gnu.org; Thu, 09 May 2024 01:36:41 -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 1s4wSN-0002FN-LN for guix-patches@gnu.org; Thu, 09 May 2024 01:36:40 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s4wSm-0003AK-5g; Thu, 09 May 2024 01:37:04 -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: Thu, 09 May 2024 05:37:04 +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.171523299412121 (code B ref 70131); Thu, 09 May 2024 05:37:04 +0000 Received: (at 70131) by debbugs.gnu.org; 9 May 2024 05:36:34 +0000 Received: from localhost ([127.0.0.1]:53091 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4wSH-00039L-DP for submit@debbugs.gnu.org; Thu, 09 May 2024 01:36:33 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:59403 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4wSB-00038W-Fq for 70131@debbugs.gnu.org; Thu, 09 May 2024 01:36:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1715232949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4FCG2lBnzCyLmQgwEKJc8BAn+SKGnBviN7jCZVLZ0w0=; b=Dkxh4EiF7OUXsfXqJV7ogCa46Rm4bs+/FIS59PLvSWJrdGf80trp0YIh8M5MilTgdCowIr 5QKLqpZGHtJvGxu5jvn646X0m80J+D7FHA3OJ2iXmPGXk9nxJxlmpmzndZRrBLtoRfIEoU JChtPoNi/qI0pRorGydyHHZUNW3g5cirXOJXnvjQxPZARDX2qP8V/gZdnWmFPqLZMn1LmN 0TCQxc/QPXtyfjfuSGV1/tHtKVhon9qZ/YcsC3UA/WswDnHnngijzlqEFtTPXpLcl2HsSK swZ81epylxGi/8hqHtM2njNCK1k9LYBb7Y2Utw+fKwqpwvkfo5qcV7LMta46+g== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 0a5c70c2 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Thu, 9 May 2024 05:35:49 +0000 (UTC) Date: Thu, 9 May 2024 07:35:30 +0200 Message-ID: <48c5f96d062321d3befee3f5028e5a075118c60f.1715232797.git.herman@rimm.ee> 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 0b00afbe78..8d62c3dad8 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -41,6 +41,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 @@ -274,6 +275,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 a6ba4b14da..9bc5aa7d40 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 d155c5365c..d282b4b684 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1154,6 +1154,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"))