From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 01 16:20:39 2024 Received: (at submit) by debbugs.gnu.org; 1 Apr 2024 20:20:39 +0000 Received: from localhost ([127.0.0.1]:51598 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrO90-00074I-JZ for submit@debbugs.gnu.org; Mon, 01 Apr 2024 16:20:38 -0400 Received: from lists.gnu.org ([2001:470:142::17]:41256) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrO8y-00073t-VB for submit@debbugs.gnu.org; Mon, 01 Apr 2024 16:20:37 -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 1rrO8q-00076d-Bf for guix-patches@gnu.org; Mon, 01 Apr 2024 16:20:28 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117] helo=email.rimm.ee) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1rrO8o-0005v9-Hc for guix-patches@gnu.org; Mon, 01 Apr 2024 16:20:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1712002820; 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; bh=hDxofN47sjUbk45MT/4ZfOWJtm3ITSpd5oTgBI/8xiA=; b=M7i4Dj51mQ0QPAjmLH6NPK0u47HAzFytGf0OdOxJK/4YJlum3bAefK92b8ZRTPbyxEE+Ip 76nyWZJlqYgONgJ5x/i3lbE0vo7csRjy8qCUv98DNFH+NgZriM0C4BUoGECJHq6IpZupQG pZSXERsi+1mMTrFsYHhNQc9qYtNadRyGnEnzRSAP0xZw/u4viTxdCk6O6Mvo5WNnNjnGs8 nOyuD8+MZaj/ld3ChKuVlQ2z8wMt4E99iehQu7ot9QuCvNHHqAVYAwto6EdLzTg4D46Y/5 n/QOgiP/Y55PVLPIYwrRhSl047JoDR+SJAwtggZ89+Sr138ScNWztroqVIzNJQ== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id d40a3f9c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 1 Apr 2024 20:20:20 +0000 (UTC) From: Herman Rimm To: guix-patches@gnu.org Subject: [PATCH 0/5] Add bootloaders and update U-Boot. Date: Mon, 1 Apr 2024 22:20:11 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@rimm.ee; helo=email.rimm.ee X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_PBL=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_RCVD_IP=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: Herman Rimm X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) Hello, Besides the bootloader, there is a patch for my Nano Pi R4S variant. For the new U-Boot release, kwbimage now enables openssl. Disabling kwbimage makes the sandbox tests fail. I disabled the tests and have not investigated further. The new release adds support for the Orange Pi Zero 2W, for which I also added a bootloader. Along the way I upgraded the ATF package, though I don't think it's required for the Zero 2W. Cheers, Herman Herman Rimm (5): gnu: bootloader: Add nanopi-r4s-rk3399 bootloader. gnu: u-boot: Use DDR3 patch for Nano Pi R4S. gnu: firmware: Update make-arm-trusted-firmware to 2.10. gnu: u-boot: Update to 2024.04-rc5. gnu: bootloader: Add orangepi-zero2w bootloader. gnu/bootloader/u-boot.scm | 24 +++- gnu/local.mk | 4 +- gnu/packages/bootloaders.scm | 66 ++++++++-- gnu/packages/firmware.scm | 11 +- .../u-boot-build-without-libcrypto.patch | 123 ------------------ .../patches/u-boot-nanopi-r4s-ddr3.patch | 25 ++++ 6 files changed, 110 insertions(+), 143 deletions(-) delete mode 100644 gnu/packages/patches/u-boot-build-without-libcrypto.patch create mode 100644 gnu/packages/patches/u-boot-nanopi-r4s-ddr3.patch base-commit: a17976e975001d3e95c998f1196a39bbb432de4f -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 01 16:23:17 2024 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) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH 1/5] gnu: bootloader: Add nanopi-r4s-rk3399 bootloader. 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-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 dele [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 TVD_RCVD_IP Message was received from an IP address -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 70131 Cc: Herman Rimm X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 dele [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 01 16:23:20 2024 Received: (at 70131) by debbugs.gnu.org; 1 Apr 2024 20:23:20 +0000 Received: from localhost ([127.0.0.1]:51616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrOBc-0007A4-4e for submit@debbugs.gnu.org; Mon, 01 Apr 2024 16:23:20 -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 1rrOBX-000796-Bf for 70131@debbugs.gnu.org; Mon, 01 Apr 2024 16:23:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1712002983; 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=5jGF+gDwe7IJOFwjqolbEJZfJax0A7tSFpbwXxo6cF8=; b=Pd8KKEeBx5UYnLDPiwFnc/Qs/LeExtmGs4YYwKOXxIZ/EmManz5fg+bI6NQTav+i3nAM5i YhvXeG9tM/w58XocSHNdW1ZuuR7tP1+gCo1yjRz8NeWZEyG2tUqZhEHTp5NI8NRY97kM44 l42DlkoYT4G1KnZSEvWJ0rmgQcLV6X4RtnaantzI1GLKC6LHojL2GH/jqiQaedW07u3ZC5 WaUGbjxJwAA0eNjSPTtv54nxLrAIDCP+HnaFjG9+rZYXQVmEE41Jvm+Z8alOe3S6z6FSX5 vxvjLsLHPj4apMc7zWeMdA8NBJ16dGQDZqQTEmEoyAhSEbzRX0JcSaWP8i8zRA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id ee94702c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 1 Apr 2024 20:23:03 +0000 (UTC) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH 2/5] gnu: u-boot: Use DDR3 patch for Nano Pi R4S. Date: Mon, 1 Apr 2024 22:22:30 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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_DAT [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 TVD_RCVD_IP Message was received from an IP address -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 70131 Cc: Herman Rimm X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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_DAT [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 f2b480bded..3c29b4a2b7 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 # @@ -2125,6 +2125,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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 01 16:23:20 2024 Received: (at 70131) by debbugs.gnu.org; 1 Apr 2024 20:23:21 +0000 Received: from localhost ([127.0.0.1]:51618 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrOBc-0007A7-KQ for submit@debbugs.gnu.org; Mon, 01 Apr 2024 16:23:20 -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 1rrOBY-000796-Sm for 70131@debbugs.gnu.org; Mon, 01 Apr 2024 16:23:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1712002984; 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=48HVSoQG9Q0SSJcCMLD73R3ZPCMjg86tawLzEYpMcno=; b=GzCCwJKIHbBMBYUptukiIiX44kw5ujI02mMyEB95uz/oBE2F8mVYPufSlu7HODw5XbHARG pA0RaHcPMnmYZTxMsOCJKCfKbkOt3zac/J6H0b284MQ1ouxD9L5uyZ96R0zVcjogdFpUxF qFdAPjGRwdeLCJ1xW6CTCUPW+2RMRnDMKS0SCSB/ErySzJndDAog6o3a57K98/4PJhw8iZ rYlIHIoJ1W+R1YIYGvhApgJKUKj2vSu/ZluUEGK79zyT2PzvpqLFXzF6NJyAQj1i49Ef57 mfnzp+GyvhaVhVgYXKtEkdzZ33HU7fEtOEcztKdTFM9gXIvNGFGE6pqvKKjmig== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 66a7364b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 1 Apr 2024 20:23:04 +0000 (UTC) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH 3/5] gnu: firmware: Update make-arm-trusted-firmware to 2.10. Date: Mon, 1 Apr 2024 22:22:31 +0200 Message-ID: <7ab4dac432108006b9b090aaefa515130c952e49.1712001963.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 828bc7402a..baf96a8212 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1096,18 +1096,17 @@ (define* [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 TVD_RCVD_IP Message was received from an IP address -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 70131 Cc: Herman Rimm X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 828bc7402a..baf96a8212 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1096,18 +1096,17 @@ (define* [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 828bc7402a..baf96a8212 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1096,18 +1096,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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 01 16:23:21 2024 Received: (at 70131) by debbugs.gnu.org; 1 Apr 2024 20:23:21 +0000 Received: from localhost ([127.0.0.1]:51620 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrOBc-0007AE-VO for submit@debbugs.gnu.org; Mon, 01 Apr 2024 16:23:21 -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 1rrOBZ-000796-Lz for 70131@debbugs.gnu.org; Mon, 01 Apr 2024 16:23:18 -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=fDne5RyigCmsc3FIjCL+nr1emCsXz0R5jmORfuR25A4=; b=ZKRV5drJRCIsaqgIxiQ6onDKL78SgQpCpvvwZ41bDvO6/QQUleHGctzkUPCgjwzOBmGipm JboR0hTeLr/v471gDTO0mufgEM5HdRi7YYk7NIyNXTBMNnIBm3bn/Aoy+QhMPD4xctkJfp QifdjPedxlPNreYhsmnOF8wxrSEoyMSeXxoEISJSYJsKN+rwu42s5j8GlVne4zb5ik9hhZ 6N8hgTrgImwehxQ5LFUMLDU45rguzagV5Ck9Ih6wyq/T5CxS3xjS37US4PqXTPx4zOqsQ6 EdsNZIABvmDJUu40TT0CS4xD3anXgsrKkqkIfFJrbhL0g5N2TEsUkO0MVpxIAw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id d4a71fa3 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 1 Apr 2024 20:23:04 +0000 (UTC) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH 4/5] gnu: u-boot: Update to 2024.04-rc5. Date: Mon, 1 Apr 2024 22:22:32 +0200 Message-ID: <3edd407b36a5e6db5d51ba8d5ff6de8bac61437d.1712001963.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/bootloaders.scm (u-boot): Update to 2024.04-rc5. [source]: Remove build-without-libcrypto patch. (%u-boot-build-without-libcrypto-patch): Remove variable. (u-boot-tools)[arguments]: Dis [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 TVD_RCVD_IP Message was received from an IP address -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 70131 Cc: Herman Rimm X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/bootloaders.scm (u-boot): Update to 2024.04-rc5. [source]: Remove build-without-libcrypto patch. (%u-boot-build-without-libcrypto-patch): Remove variable. (u-boot-tools)[arguments]: Dis [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/bootloaders.scm (u-boot): Update to 2024.04-rc5. [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 3c29b4a2b7..c6c6cf7077 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2122,7 +2122,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..ae604ab5bb 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-rc5") (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")))) + "18bx7v7mnqs316idkbd5a7rsg4ahdyxl8mrynrac3dfwq06x0cc5")))) (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 - -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 01 16:23:22 2024 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) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH 5/5] gnu: bootloader: Add orangepi-zero2w bootloader. 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-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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- [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 TVD_RCVD_IP Message was received from an IP address -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 70131 Cc: Herman Rimm X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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- [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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")) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu May 09 01:36:29 2024 Received: (at 70131) by debbugs.gnu.org; 9 May 2024 05:36:30 +0000 Received: from localhost ([127.0.0.1]:53080 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4wS7-00038X-L1 for submit@debbugs.gnu.org; Thu, 09 May 2024 01:36:29 -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 1s4wS1-00038P-Se for 70131@debbugs.gnu.org; Thu, 09 May 2024 01:36:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1715232944; 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; bh=cBxeIf8X4csQDOKnLBxXeUTDbIhVGR4DWe1l6nUeiT0=; b=Jsd1wk6gAzE6EgGJyzJ10LRHaOECCVZjepx4jqQIRCx3zDOPd5VIvdPP6fml7D+VYjWjra y4j0/tCvj6XM5algvTnYUnaL4saVfa/0OzPGnig7tKldNtypOy/ZlXS7kw5IHLt9Z1ZznA SvFQBORUbAsVelK72tf6MMzoMly0/+DKLA5ijd0MVIxp9C6klPIV8hQdYdzgsDB3f91mH2 N6do/eNlliqjOBVEQIuz+e6GV5S4m/NWYeZGCY7C2slIhTM8oibg3FTeLBae0x1jNj84ub Si7eT1PR9dJIaTFuehPbClcQncAxo6uQ+mf1gBV+9IDP/F/Jh538BpvTnF2n9Q== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id a1179c86 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Thu, 9 May 2024 05:35:44 +0000 (UTC) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH 0/5] Update U-boot. Date: Thu, 9 May 2024 07:35:25 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello, I bumped U-boot to a proper release, that's all. Cheers, Herman Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 TVD_RCVD_IP Message was received from an IP address 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 70131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello, I bumped U-boot to a proper release, that's all. Cheers, Herman Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Hello, I bumped U-boot to a proper release, that's all. Cheers, Herman Herman Rimm (5): gnu: bootloader: Add nanopi-r4s-rk3399 bootloader. gnu: u-boot: Use DDR3 patch for Nano Pi R4S. gnu: firmware: Update make-arm-trusted-firmware to 2.10. gnu: u-boot: Update to 2024.04. gnu: bootloader: Add orangepi-zero2w bootloader. gnu/bootloader/u-boot.scm | 24 +++- gnu/local.mk | 4 +- gnu/packages/bootloaders.scm | 66 ++++++++-- gnu/packages/firmware.scm | 11 +- .../u-boot-build-without-libcrypto.patch | 123 ------------------ .../patches/u-boot-nanopi-r4s-ddr3.patch | 25 ++++ 6 files changed, 110 insertions(+), 143 deletions(-) delete mode 100644 gnu/packages/patches/u-boot-build-without-libcrypto.patch create mode 100644 gnu/packages/patches/u-boot-nanopi-r4s-ddr3.patch base-commit: 014875b29e68da6357a5323e6dd1eaa74a05b753 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu May 09 01:36:30 2024 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) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH 1/5] gnu: bootloader: Add nanopi-r4s-rk3399 bootloader. 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-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 dele [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 TVD_RCVD_IP Message was received from an IP address -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 70131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 dele [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 From debbugs-submit-bounces@debbugs.gnu.org Thu May 09 01:36:31 2024 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) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH 2/5] gnu: u-boot: Use DDR3 patch for Nano Pi R4S. 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-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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_DAT [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 TVD_RCVD_IP Message was received from an IP address -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 70131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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_DAT [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu May 09 01:36:33 2024 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) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH 4/5] gnu: u-boot: Update to 2024.04. 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-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 TVD_RCVD_IP Message was received from an IP address -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 70131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 - -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu May 09 01:36:33 2024 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) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH 5/5] gnu: bootloader: Add orangepi-zero2w bootloader. 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-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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- [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 TVD_RCVD_IP Message was received from an IP address -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 70131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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- [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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")) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu May 09 01:36:34 2024 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) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH 3/5] gnu: firmware: Update make-arm-trusted-firmware to 2.10. 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-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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* [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 TVD_RCVD_IP Message was received from an IP address -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 70131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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* [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed May 15 14:16:47 2024 Received: (at 70131) by debbugs.gnu.org; 15 May 2024 18:16:47 +0000 Received: from localhost ([127.0.0.1]:43660 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7JBH-0002ZQ-1V for submit@debbugs.gnu.org; Wed, 15 May 2024 14:16:47 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:40236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7JBE-0002Z7-P0 for 70131@debbugs.gnu.org; Wed, 15 May 2024 14:16:45 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 99FA01AA9A; Wed, 15 May 2024 11:16:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1715796963; bh=2lj8rSPEnV3KXGLPXRYfED2QsoYmBYaL/lVKh12IO34=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=d4AHodAhGHwfl3Pzm7v41rZJ7srcw0HnGMlLzLNzIRcokNLwd3f3rnBXCGusyFgu/ qEOmviC+7KnfZS/Ls6dN76ZzRsmn40TYGAajC1VjxZGYzKjsLW92JlshgA8d13RRs6 qlCCg5LY0M4ULfyVNVPBpoZ1V7XUgrXFVyE//ogvBEGBVNPfjuvuowpA4cOc6P4Xq0 T4x1fZK2Z/KmE0AovAYlHsdfvOceRAEuYJPAZdkVbzHIAOVEGozo8HQIXFv14sXU6t /Wx5svLAutvOudXDYdegrgrT1b0J2nqgURBBvDUD/TNo+FA75ZppV8C1AAtw4WCQLb qmXvKys0SdL3w== From: Vagrant Cascadian To: Herman Rimm , 70131@debbugs.gnu.org Subject: Re: [bug#70131] [PATCH 2/5] gnu: u-boot: Use DDR3 patch for Nano Pi R4S. In-Reply-To: References: Date: Wed, 15 May 2024 11:16:00 -0700 Message-ID: <87h6ezrlen.fsf@wireframe> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70131 Cc: Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2024-05-09, Herman Rimm wrote: > * 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. ... > diff --git a/gnu/packages/patches/u-boot-nanopi-r4s-ddr3.patch b/gnu/pack= ages/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/r= k3399-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 @@ > + */ > +=20 > + #include "rk3399-nanopi4-u-boot.dtsi" > +-#include "rk3399-sdram-lpddr4-100.dtsi" > ++#include "rk3399-sdram-ddr3-1866.dtsi" > +=20 > + / { > + smbios { > +diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk= 3399_defconfig > +index 4f4363cb0f..bfa7ee628d 100644 > +--- a/configs/nanopi-r4s-rk3399_defconfig > ++++ b/configs/nanopi-r4s-rk3399_defconfig > +@@ -54,7 +54,6 @@ CONFIG_PMIC_RK8XX=3Dy > + CONFIG_REGULATOR_PWM=3Dy > + CONFIG_REGULATOR_RK8XX=3Dy > + CONFIG_PWM_ROCKCHIP=3Dy > +-CONFIG_RAM_ROCKCHIP_LPDDR4=3Dy > + CONFIG_BAUDRATE=3D1500000 > + CONFIG_DEBUG_UART_SHIFT=3D2 > + CONFIG_SYS_NS16550_MEM32=3Dy > --=20 > 2.41.0 Is this patch submitted upstream or present in newer versions? Are all boards of this type using DDR3, or are there some that use LPDDR4? This sort of information would be nice to include inside the .patch file itself. live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZkT74AAKCRDcUY/If5cW qsE0AQCLG4mIrX6FLC+ooGa3sOCNT6zWkGlZLlL9HNd0yxPCKwD/fBhEbXLYRcJi /MeERrbhx91X6BBOoNKb35OmgPAZ1QM= =FQ/x -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed May 15 16:26:41 2024 Received: (at 70131) by debbugs.gnu.org; 15 May 2024 20:26:41 +0000 Received: from localhost ([127.0.0.1]:44278 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7LCz-0007E4-98 for submit@debbugs.gnu.org; Wed, 15 May 2024 16:26:41 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:57044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7LCw-0007Dy-Gu for 70131@debbugs.gnu.org; Wed, 15 May 2024 16:26:39 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 5F8E71AA9A; Wed, 15 May 2024 13:26:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1715804787; bh=b+tSMYbkz+47KouP6Mc/LSIVd9aDGzulemsN6kBMcLU=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=Z6alsJW+HrOdz5Hp3LepjbtK8yMA+NIGULFaOfdjEuiixWMgqc9qfT9d3zXLiIkUV jthT+v6MmjDYw4gtzo1MI68Q2T06pPgTCFr9qu/2iekTdibs3blQOBgHgKfv0qxJDv oMEJAo1xbVz7/m8lkNccBBrQoQTiY1xwzC8uzklsOqcD8JXt4CF+/+Sax0fSxy6RFy eDBDaokSSpv66xuuXEgs09iwYpee7RYNIo7YeRU5jDB/gxtVS45bZeKFFmpLqDZPmM d1svJqMyQjPqlh0guB/Ga7KspyMWm9e6XwASj8vj2cKeUdoVMTA0QkkAhtjMsZZaCN 6sVEBpjFizTew== From: Vagrant Cascadian To: Herman Rimm Subject: Re: [bug#70131] [PATCH 0/5] Update U-boot. In-Reply-To: References: Date: Wed, 15 May 2024 13:26:01 -0700 Message-ID: <87a5kqstye.fsf@wireframe> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70131 Cc: 70131@debbugs.gnu.org, Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain My summary of the situation so far... On 2024-05-09, Herman Rimm wrote: > Herman Rimm (5): > gnu: bootloader: Add nanopi-r4s-rk3399 bootloader. Looks good, although is it useful without the follow-up patch? If not, I would squash the two in a single commit? > gnu: u-boot: Use DDR3 patch for Nano Pi R4S. Question regarding the upstream status for this patch and including relevent descriptions about upstream status, origin, purporse, etc. in the .patch comments. > gnu: firmware: Update make-arm-trusted-firmware to 2.10. I can confirm the upstream hashes on this and it builds. I suspect this would be fine to merge as-is even without including the other patches in the series, though I have not verified this as yet. > gnu: u-boot: Update to 2024.04. Also able to confirm the upstream hashes, although at least two packages to fail to build, u-boot-sandbox and u-boot-rockpro64-rk3399. From the comments on the earlier series, I am guessing you were aware of this, but figured I'd mention which packages. This is probably due to trying to build without openssl, due to (potential) license incompatibilities between openssl and GPL; this is not well suppored upstream and we have been carrying patches for quite some time about this... > gnu: bootloader: Add orangepi-zero2w bootloader. Looks good. For the most part, there are substitutes available from bordeaux, at least for x86_64. I will also try to do some builds on aarch64. live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZkUaWQAKCRDcUY/If5cW qg6jAP40Qon8lMEraz+VSXg7Toy/3KU6ohPJ9syKDB5dO5O+mwD/Voh1S42rpLdC uGpWGQ/slrV5K0hspUXXWx3nR/+b3Ac= =KPb7 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu May 16 03:29:06 2024 Received: (at 70131) by debbugs.gnu.org; 16 May 2024 07:29:06 +0000 Received: from localhost ([127.0.0.1]:47156 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7VY2-0007LC-6M for submit@debbugs.gnu.org; Thu, 16 May 2024 03:29:06 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:34947 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7VXv-0007Kl-7x for 70131@debbugs.gnu.org; Thu, 16 May 2024 03:29:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1715844528; 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: in-reply-to:in-reply-to:references:references; bh=shRTTIIgQCYt+rzaaeBBstqI6fo+exjN1rCO3alhJ5Y=; b=aZVrGLlgBgcfYclB/00KzCH+bbSWHmNjFp+qw8Vra0mU5ESUnJmG/Mpc9e4EmsncvG66qE ug/nY1fJATM5YfdjaqZ9osOGGVW+CSVrK39T5cCqcTHXrp4jg2tOlhIvz25sfTG3+IcsRK SxBazYXt2J0b8P/J3jRPjh2HwvBxLTMcliJRY7AzzYwlwUBrW+vE5GdiSvDWRJZXpv5FWU u+NR5oy67YoA+TrF80KZYzwNl+eywiXEQ1iSt9TAIKsDnPiQWUnvfgp39Zc1eNDBrFsatc 4k7Tl5nu4XTNk59huX2hX78JaB3kvUpYb8dLajOVtwwH+h+idINDeUuIGxLLCg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 34c99cc7 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 16 May 2024 07:28:48 +0000 (UTC) Date: Thu, 16 May 2024 09:28:39 +0200 From: Herman Rimm To: Vagrant Cascadian Subject: Re: [bug#70131] [PATCH 0/5] Update U-boot. Message-ID: References: <87a5kqstye.fsf@wireframe> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87a5kqstye.fsf@wireframe> X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello, On Wed, May 15, 2024 at 01:26:01PM -0700, Vagrant Cascadian wrote: > My summary of the situation so far... > > On 2024-05-09, Herman Rimm wrote: > > Herman Rimm (5): > > gnu: bootloader: Add nanopi-r4 [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 TVD_RCVD_IP Message was received from an IP address 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 70131 Cc: 70131@debbugs.gnu.org, Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello, On Wed, May 15, 2024 at 01:26:01PM -0700, Vagrant Cascadian wrote: > My summary of the situation so far... > > On 2024-05-09, Herman Rimm wrote: > > Herman Rimm (5): > > gnu: bootloader: Add nanopi-r4 [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Hello, On Wed, May 15, 2024 at 01:26:01PM -0700, Vagrant Cascadian wrote: > My summary of the situation so far... > > On 2024-05-09, Herman Rimm wrote: > > Herman Rimm (5): > > gnu: bootloader: Add nanopi-r4s-rk3399 bootloader. > > Looks good, although is it useful without the follow-up patch? If not, I > would squash the two in a single commit? The bootloader with the DDR3 patch works, so it should also work without the patch. I believe the LPDDR4 version is more common because it has OpenWRT support while the DDR3 version does not [1]. The LPDDR4 version would not be useful to me, but in general it would be more useful. > > gnu: u-boot: Use DDR3 patch for Nano Pi R4S. > > Question regarding the upstream status for this patch and including > relevent descriptions about upstream status, origin, purporse, etc. in > the .patch comments. The patch is not submitted upstream or already present upstream. I made the patch for the DDR3 (as opposed to LPDDR4) variant of the Nano Pi R4S. I will write this in the patch comments as well. Should there be bootloaders for both Nano Pi R4S variants? > > gnu: u-boot: Update to 2024.04. > > Also able to confirm the upstream hashes, although at least two packages > to fail to build, u-boot-sandbox and u-boot-rockpro64-rk3399. From the > comments on the earlier series, I am guessing you were aware of this, > but figured I'd mention which packages. I will try getting u-boot-rockpro64-rk3399 to build. Cheers, Herman [1]: https://openwrt.org/toh/friendlyarm/nanopi_r4s_v1 From debbugs-submit-bounces@debbugs.gnu.org Thu May 16 11:57:19 2024 Received: (at 70131) by debbugs.gnu.org; 16 May 2024 15:57:19 +0000 Received: from localhost ([127.0.0.1]:49479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7dTq-0008UY-SM for submit@debbugs.gnu.org; Thu, 16 May 2024 11:57:19 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:42172) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7dTn-0008UQ-Qu for 70131@debbugs.gnu.org; Thu, 16 May 2024 11:57:16 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 47B621AAE6; Thu, 16 May 2024 08:56:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1715874994; bh=8deM2ZbT7kVi8LSsl5FCS2LR9fEF1ClO6mOxuO5Ln2w=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=WhHf+q7EB8pT757xxdbnVWRfI5Dtvs/xoB0N2ec0Cb3MrHqJYv2Z9VoQmHeV5wlwS E6skJdmkMnnqKohObXiEpUI1cIG8dLvE6KVOutGbMFr1/IpN7m3Vj0iqXg5eVSQsnh /dPnJi2Ec7s89BQVNxZ3ZNRZKOa4NXD9qgHcTlOIoVcgrVxSZsEO28yLbY23oOY1SQ aaVDkcX6LVQsjW6oBl9mRJJPm/u+shMZzwMPAephb5BRvz1SQyxzLSlG7wGp77b0dd 7cdqTFvf0hRQkpSeO3Dj1EWW+Uc7v96HmKLgxFG8enpNJHWEZIuCfklDaIcUZg3lvr 2S15SsR1UrZPg== From: Vagrant Cascadian To: Herman Rimm Subject: Re: [bug#70131] [PATCH 0/5] Update U-boot. In-Reply-To: References: <87a5kqstye.fsf@wireframe> Date: Thu, 16 May 2024 08:56:27 -0700 Message-ID: <87wmntrbro.fsf@wireframe> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70131 Cc: 70131@debbugs.gnu.org, Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2024-05-16, Herman Rimm wrote: > On Wed, May 15, 2024 at 01:26:01PM -0700, Vagrant Cascadian wrote: >> My summary of the situation so far... >>=20 >> On 2024-05-09, Herman Rimm wrote: >> > Herman Rimm (5): >> > gnu: bootloader: Add nanopi-r4s-rk3399 bootloader. >>=20 >> Looks good, although is it useful without the follow-up patch? If not, I >> would squash the two in a single commit? > > The bootloader with the DDR3 patch works, so it should also work without > the patch. I believe the LPDDR4 version is more common because it has > OpenWRT support while the DDR3 version does not [1]. The LPDDR4 version > would not be useful to me, but in general it would be more useful. Got it, thanks! >> > gnu: u-boot: Use DDR3 patch for Nano Pi R4S. >>=20 >> Question regarding the upstream status for this patch and including >> relevent descriptions about upstream status, origin, purporse, etc. in >> the .patch comments. > > The patch is not submitted upstream or already present upstream. I made > the patch for the DDR3 (as opposed to LPDDR4) variant of the Nano Pi > R4S. I will write this in the patch comments as well. Great! > Should there be bootloaders for both Nano Pi R4S variants? Based on the fact that there are two models with different hardware, seems like there should be two variants of the package. Bringing this up upstream might also be a good idea, as they might either make a second variant upstream, or suggest a clever way to have a single build that autodetects which variant it is and "does the right thing" out of the box. If you do start such a thread, a link to the discussion would be great to have in the patch comments. >> > gnu: u-boot: Update to 2024.04. >>=20 >> Also able to confirm the upstream hashes, although at least two packages >> to fail to build, u-boot-sandbox and u-boot-rockpro64-rk3399. From the >> comments on the earlier series, I am guessing you were aware of this, >> but figured I'd mention which packages. > > I will try getting u-boot-rockpro64-rk3399 to build. Thanks! live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZkYsrAAKCRDcUY/If5cW qqF2AP4tJoxrcJ2xWYaYoQuNzdNdtCWee+wsfGzijcZMlx6juAEA9ml2ny498DRz kyMRd8uiNf26BQp4Fi6pQq90p9syOgg= =7kB3 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 26 10:47:02 2024 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) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH v2 1/8] gnu: bootloader: Add nanopi-r4s-rk3399 bootloader. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 dele [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 TVD_RCVD_IP Message was received from an IP address 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 70131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 dele [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 26 10:47:05 2024 Received: (at 70131) by debbugs.gnu.org; 26 Aug 2024 14:47:05 +0000 Received: from localhost ([127.0.0.1]:45042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siazo-00088E-Pf for submit@debbugs.gnu.org; Mon, 26 Aug 2024 10:47:05 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:34317 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siazl-00087B-DQ for 70131@debbugs.gnu.org; Mon, 26 Aug 2024 10:47:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1724683557; 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=nUf/JrJVT27pCFqUqWC3hvOqTE6h1rG/ZaHwPqb1Ay8=; b=nLQ+wPq7+G9ZASXHiszn0zgpGiWysbooOKtl9e5PWi9qeg+ySlvEQ//G5y5LfNQbGICOCH Qmz/+Oq7PxJugbxfnK6yVR9+KkpiX+BEq0yCvkh82MCZ4VqXDmBT+zNvo7y7jGAnDKs6+S ZxruqOsvxqHXohE5uQeqsBMIEhQ9eo4eNIKV4IfS6FS3aJ71aLj3KfUpjkxzljs3DRQ0+l umBlSJOBJDGxqnAH7KiceXPAxnaEsS2Wh3AK3bQeYFzFgViWwaQ7kAUEt68dLTdGzxkCNZ 39go7b5d5TudZ/5l9EmFThZmqRgAySzcvsKV/hOmx4pU+NLv8OsmPfSC0EZkPA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 0b2a0806 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Mon, 26 Aug 2024 14:45:57 +0000 (UTC) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH v2 3/8] gnu: firmware: Update make-arm-trusted-firmware to 2.10. Date: Mon, 26 Aug 2024 16:45:02 +0200 Message-ID: <20240826144511.3770-3-herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240826144511.3770-1-herman@rimm.ee> References: <20240826144511.3770-1-herman@rimm.ee> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 4348612567..14fa72bf7e 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1105,18 +1105,17 @@ (define* [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 TVD_RCVD_IP Message was received from an IP address 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 70131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 4348612567..14fa72bf7e 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1105,18 +1105,17 @@ (define* [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 4348612567..14fa72bf7e 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1105,18 +1105,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)) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 26 10:47:09 2024 Received: (at 70131) by debbugs.gnu.org; 26 Aug 2024 14:47:09 +0000 Received: from localhost ([127.0.0.1]:45047 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siazs-00088y-7x for submit@debbugs.gnu.org; Mon, 26 Aug 2024 10:47:09 -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 1siazk-000871-C6 for 70131@debbugs.gnu.org; Mon, 26 Aug 2024 10:47:03 -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: in-reply-to:in-reply-to:references:references; bh=hOwE/rQcu+h0Smx9elWmH0EyYZjUMnF2XQF63Pv+ZBg=; b=dxOn4np7C3W26cKVR0qy12GFmv2v2Mp5Kh7tTJXLptgR7BsYQwyJLm0mcyTC38KAHphqlQ cL/6eXw5PG/gTOo4SxwU38Fat+tG0PzOckOvTsMljIdfg9VK84QjP2Sjd7u+DQsvIo0Im8 IyGAJgrHfD21L2eYzl5pPs1On7War+j+4XsiLpeovsIaX5jCPEKMNDX2y262OdrRB8wIkN /ZVQYhyRASb5BQpB2Z/N50HdgH6hV0GIak2HTqMRXP/x8yY2Wau+GRMqwnmPZyr59W+yLZ yegrbTs+rKAfG1rvCo5sYznPzwrRDyxxrdnrO9c/zYKRhEgGUupUItt+9ZoGgg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 4893b3e3 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Mon, 26 Aug 2024 14:45:56 +0000 (UTC) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH v2 2/8] gnu: u-boot: Use DDR3 patch for Nano Pi R4S. Date: Mon, 26 Aug 2024 16:45:01 +0200 Message-ID: <20240826144511.3770-2-herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240826144511.3770-1-herman@rimm.ee> References: <20240826144511.3770-1-herman@rimm.ee> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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_DAT [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 TVD_RCVD_IP Message was received from an IP address 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 70131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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_DAT [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 | 35 +++++++++++++++++++ 3 files changed, 43 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 11dff1c6c4..93cd03fbd7 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 # Copyright © 2024 Ashish SHUKLA @@ -2168,6 +2168,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 f42d42c1c4..1036c62de3 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -747,6 +747,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") @@ -755,7 +759,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..38825bbd1b --- /dev/null +++ b/gnu/packages/patches/u-boot-nanopi-r4s-ddr3.patch @@ -0,0 +1,35 @@ +Someone created a thread on the U-Boot mailing list [1], referencing work +done to support variants of RK3399 SoCs with different types of DRAM [2]. +This patch configures the Nano Pi R4S to use DDR3 instead of LPDDR4, but +will be removed once [2] is included in a future U-Boot release. This +patch was created around April 2023 by Herman Rimm for +personal use and has only been submitted to GNU Guix. + +[1]: https://patchwork.ozlabs.org/project/uboot/patch/WwCslkoi6ts6A8RCd6KlxuRAMpItkfneEG-3BbNbG61gWVz0A2A3-0hl_Jg7W9quLr19luuiiT7naEi7djncCaEruUOnVq3pnb9dQFU_GqY=@protonmail.com/#2973664 +[2]: https://github.com/anaelorlinski/OpenWrt-NanoPi-R2S-R4S-Builds/commit/9d836044340ddef53f5d9f1946ac48c946a78284 + +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 -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 26 10:47:09 2024 Received: (at 70131) by debbugs.gnu.org; 26 Aug 2024 14:47:10 +0000 Received: from localhost ([127.0.0.1]:45049 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siazt-000890-2f for submit@debbugs.gnu.org; Mon, 26 Aug 2024 10:47:09 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:34317 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siazn-00087B-FC for 70131@debbugs.gnu.org; Mon, 26 Aug 2024 10:47:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1724683557; 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=ubk37vZLf5GWn5dkhd9ncUKQ4K9f5CVSEpr5KvCuyXk=; b=A2A33fFouI2TDJceFWYl6+TZ+gruDGfJpD2lfNXZoGOQfauwZQMM7H6Ln7zJMMblZimXEk jo6drB6A/7o504e796CMtHqEJd1pcTGjLoMeCACQ/zDzgC+ZkO6xhRMOukd+QKp2VsHHuZ KkpGMkDIEiRR2PGE0mRIGoO40zkjoAXmcSZMtnAKVyO6VgQMyzd7C23XArL4ECOcAmz4Em IUlsJcBhtj1atup2/xKGqNAFw9Io7VJoqp/Tn29P+tvPLwA6GjyVbD3WS4rkDXEy4VJ9Ks hI8nRwA4QKJ3Lg0u2G88FTg4P5wn0zftCdWazC73VADZIuBpe47lHqs8uGH7VA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 8c5d855e (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Mon, 26 Aug 2024 14:45:57 +0000 (UTC) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH v2 4/8] gnu: u-boot: Update to 2024.07. Date: Mon, 26 Aug 2024 16:45:03 +0200 Message-ID: <20240826144511.3770-4-herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240826144511.3770-1-herman@rimm.ee> References: <20240826144511.3770-1-herman@rimm.ee> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/bootloaders.scm (u-boot): Update to 2024.07. [source]: Remove build-without-libcrypto patch. (%u-boot-build-without-libcrypto-patch): Remove variable. (u-boot-tools)[arguments]: Disable [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 TVD_RCVD_IP Message was received from an IP address 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 70131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/bootloaders.scm (u-boot): Update to 2024.07. [source]: Remove build-without-libcrypto patch. (%u-boot-build-without-libcrypto-patch): Remove variable. (u-boot-tools)[arguments]: Disable [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/bootloaders.scm (u-boot): Update to 2024.07. [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 93cd03fbd7..5ca975fbe7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2165,7 +2165,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 1036c62de3..fa9acd0bd9 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -743,10 +743,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")) @@ -754,11 +750,10 @@ (define %u-boot-nanopi-r4s-ddr3-patch (define u-boot (package (name "u-boot") - (version "2024.01") + (version "2024.07") (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) @@ -767,7 +762,7 @@ (define u-boot "u-boot-" version ".tar.bz2")) (sha256 (base32 - "1czmpszalc6b8cj9j7q6cxcy19lnijv3916w3dag6yr3xpqi35mr")))) + "13rwv28g6z8ihrs8k0066gblw37rvw6nsxkks6rxdwqfp6ddm4gm")))) (build-system gnu-build-system) (native-inputs (list bison @@ -864,9 +859,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\"") @@ -889,14 +886,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"))) @@ -1098,7 +1097,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 - -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 26 10:47:10 2024 Received: (at 70131) by debbugs.gnu.org; 26 Aug 2024 14:47:10 +0000 Received: from localhost ([127.0.0.1]:45051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siazt-000898-RY for submit@debbugs.gnu.org; Mon, 26 Aug 2024 10:47:10 -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 1siazo-000871-7L for 70131@debbugs.gnu.org; Mon, 26 Aug 2024 10:47:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1724683557; 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=Sh7+VrGbIbDscZTvmQJYyqUPWvqsr4efnZdmJM3RJ6E=; b=CztJ8iGrMmggMcnAh53TSQr7MrdDhPBOWG1nQiKTktUE4tXvmDCu+accPqgoyj/TDFIyxK XarIgbrSI0hJf3KPvcg2BvnYah9YlKNq01VnXuVKNxMwy1fl/Ivf4TyrAAfx4S43pERzYK Ae/e5UczBkDB4B3uyR1FhKNn4WkYMTkA/1gikSIt+RT5mFSHCO7SF6DgWOsWRSO43gzVSD Dbvjg6jPGAalK9gy3F0uZ4ffjesQGxNanRDkEt7iTGaByBd/fZuis3M9XT5JpF2JdmjOJz qvdSi8LzZtIQfoiy5Tr/vTnKlWNZ1TOL+f5dQfnjU/DXM9Wt3n8ygZhzVJxZNA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 4268806a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Mon, 26 Aug 2024 14:45:57 +0000 (UTC) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH v2 5/8] gnu: python-u-boot-pylib: Fix pyproject.toml. Date: Mon, 26 Aug 2024 16:45:04 +0200 Message-ID: <20240826144511.3770-5-herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240826144511.3770-1-herman@rimm.ee> References: <20240826144511.3770-1-herman@rimm.ee> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/bootloaders.scm (python-u-boot-pylib)[arguments]: Add list-package phase. --- gnu/packages/bootloaders.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index fa9acd0bd9..d8d1add399 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -958,6 +958,13 @@ [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 TVD_RCVD_IP Message was received from an IP address 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 70131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/bootloaders.scm (python-u-boot-pylib)[arguments]: Add list-package phase. --- gnu/packages/bootloaders.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index fa9acd0bd9..d8d1add399 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -958,6 +958,13 @@ [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/bootloaders.scm (python-u-boot-pylib)[arguments]: Add list-package phase. --- gnu/packages/bootloaders.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index fa9acd0bd9..d8d1add399 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -958,6 +958,13 @@ (define-public python-u-boot-pylib (add-after 'unpack 'chdir (lambda _ (chdir "tools/u_boot_pylib"))) + (add-after 'chdir 'list-package + (lambda _ + (let ((port (open-file "pyproject.toml" "a"))) + (display "[tool.setuptools.packages.find]\n" port) + (display "where = [\"..\"]\n" port) + (display "include = [\"u_boot_pylib*\"]" port) + (close-port port)))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 26 10:47:10 2024 Received: (at 70131) by debbugs.gnu.org; 26 Aug 2024 14:47:10 +0000 Received: from localhost ([127.0.0.1]:45053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siazu-00089F-70 for submit@debbugs.gnu.org; Mon, 26 Aug 2024 10:47:10 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:34317 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siazo-00087B-Oc for 70131@debbugs.gnu.org; Mon, 26 Aug 2024 10:47:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1724683558; 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=gh75pz1Okhhr+6mD2es7C+RlFsLXXwWh+NjZZsGrxug=; b=mkBAjOgVzOPlKKSpaXAB7UCV+L0WYi/9lRMmnOHpwxp5vBBz4wZRPrRjmwdB82vj9UOkwW EKDH4LeUSnIO0P7y1Cl7PTDWPBQgODXeyiBLKhC2eyS/squCFurUCSKCH3oRVAAMhIbfUg 85+ro6l7jdtgNoj7zwRCHR1PLhHu6fvcJ1reWsRg7KhGU9J/QWsF8aKv8yT9pqr9BQnf4A gHSjX9qSmsen7rlIr3NaFYUI+s6IvCoR242Nuo6dEFMrCEUTF8NvlyClCi5Aece8LiGhVY j+3dtwnXo09g2AO1M1AKPv81hObK7XSidQGtMeAlCaHFfS2d7nQzK6ev4UeH6Q== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 56a38165 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Mon, 26 Aug 2024 14:45:57 +0000 (UTC) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH v2 6/8] gnu: u-boot-rockpro64-rk3399: Unconfigure CONFIG_DM_SCSI. Date: Mon, 26 Aug 2024 16:45:05 +0200 Message-ID: <20240826144511.3770-6-herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240826144511.3770-1-herman@rimm.ee> References: <20240826144511.3770-1-herman@rimm.ee> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/bootloaders (u-boot-rockpro64-rk3399): Remove CONFIG_DM_SCSI in favor of CONFIG_SCSI. --- gnu/packages/bootloaders.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index d8d1add399..127340d4c1 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1463,7 +1463,6 @@ [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 TVD_RCVD_IP Message was received from an IP address 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 70131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/bootloaders (u-boot-rockpro64-rk3399): Remove CONFIG_DM_SCSI in favor of CONFIG_SCSI. --- gnu/packages/bootloaders.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index d8d1add399..127340d4c1 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1463,7 +1463,6 @@ [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/bootloaders (u-boot-rockpro64-rk3399): Remove CONFIG_DM_SCSI in favor of CONFIG_SCSI. --- gnu/packages/bootloaders.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index d8d1add399..127340d4c1 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1463,7 +1463,6 @@ (define-public u-boot-rockpro64-rk3399 "CONFIG_SATA_SIL=y" "CONFIG_SCSI=y" "CONFIG_SCSI_AHCI=y" - "CONFIG_DM_SCSI=y" ;; Disable SPL FIT signatures, ;; due to GPLv2 and Openssl ;; license incompatibilities -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 26 10:47:10 2024 Received: (at 70131) by debbugs.gnu.org; 26 Aug 2024 14:47:11 +0000 Received: from localhost ([127.0.0.1]:45055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siazu-00089M-JM for submit@debbugs.gnu.org; Mon, 26 Aug 2024 10:47:10 -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 1siazp-000871-0e for 70131@debbugs.gnu.org; Mon, 26 Aug 2024 10:47:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1724683558; 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=4yfAGrSc+YbZjnd8tIMnHkN4fFryrqkKWn/6CIJIsSM=; b=di11dftRb8omKK90v2AwQlb7H1WwgAH72xrWP6HU/JDQcLLOp3wI7ZOwN1pzvfdXTNqbf1 +g0Arge6nU+rVrfwPZfPZNf5LxfLhfmKjewVCDWPVxI46K1TvCO+E3chDYC81fnougtUdR rBSX0mFKhdZbQj9/8CGE7tnN1rp62XIBlsw+bxTwHLFB5Zt+5w9FCboZvClV5+2MTgwsTx LQlsghkBIU5vOhm6a2zfUm3rw1btxoTv8GlIAL021oKosUNsiYStW2SEYfmuSMY1Rf4smw QCkdITeMVuL5xyYclXUT0r7eyaZwpbRdRWI20NYTWlu4uvQ4WYRXUQtqdr9GIw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 2eaf43c9 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Mon, 26 Aug 2024 14:45:58 +0000 (UTC) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH v2 7/8] gnu: u-boot-sandbox: Unconfigure CONFIG_RSA and CONFIG_TOOLS_LIBCRYPTO. Date: Mon, 26 Aug 2024 16:45:06 +0200 Message-ID: <20240826144511.3770-7-herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240826144511.3770-1-herman@rimm.ee> References: <20240826144511.3770-1-herman@rimm.ee> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/bootloaders.scm (u-boot-sandbox): Remove CONFIG_RSA and CONFIG_TOOLS_LIBCRYPTO. --- gnu/packages/bootloaders.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 127340d4c1..69c0e0fcfd 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1340,9 +1340,7 @@ [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 TVD_RCVD_IP Message was received from an IP address 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 70131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/bootloaders.scm (u-boot-sandbox): Remove CONFIG_RSA and CONFIG_TOOLS_LIBCRYPTO. --- gnu/packages/bootloaders.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 127340d4c1..69c0e0fcfd 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1340,9 +1340,7 @@ [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/bootloaders.scm (u-boot-sandbox): Remove CONFIG_RSA and CONFIG_TOOLS_LIBCRYPTO. --- gnu/packages/bootloaders.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 127340d4c1..69c0e0fcfd 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1340,9 +1340,7 @@ (define-public u-boot-sandbox "# CONFIG_IMAGE_PRE_LOAD is not set" "# CONFIG_IMAGE_PRE_LOAD_SIG is not set" "# CONFIG_CMD_BOOTM_PRE_LOAD is not set" - "CONFIG_RSA=y" - "# CONFIG_EFI_SECURE_BOOT is not set" - "# CONFIG_TOOLS_LIBCRYPTO is not set") + "# CONFIG_EFI_SECURE_BOOT is not set") #:append-description "The sandbox configuration of U-Boot provides a @command{u-boot} command that runs as a normal user space application. It can -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 26 10:47:11 2024 Received: (at 70131) by debbugs.gnu.org; 26 Aug 2024 14:47:11 +0000 Received: from localhost ([127.0.0.1]:45057 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siazu-00089U-TZ for submit@debbugs.gnu.org; Mon, 26 Aug 2024 10:47:11 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:34317 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siazp-00087B-EL for 70131@debbugs.gnu.org; Mon, 26 Aug 2024 10:47:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1724683558; 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=+U5JQq3Nyo4EVKT0dGN6QBE21ML/gkWPN/BIbine+N8=; b=Dp0udDcfbVaCOoU9RcCeD+IS3RbC2XBCH+OCerhVFHbQOHZ8ZFpj97+vwXqDlbqBYiqopg 9GTahUezJgN2QKMnSbqWSwDbJBlEKR1ckLn6UGNnOqmkzs3kna2rus0E3IX+RDKJC/iJxG riT93ja+RuNAilMGfgJtlVHbvssQCx4RSmPrXuV9SyZMYCge5rkDzgGkl9URJYLQWf1Wc2 ZSyvKIa/UUxfU8GYI4wXpgRIT4v5yXfypuqqeMrnNdADexbxQ7xdqAvV3446E09dXuC3ec T6UZvj/ItUgOQcClqsP4XIFNcZIUZiIXWQb4Q2xg+Xdd9GgG/bhYT3ArqQxofg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 801bef4a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Mon, 26 Aug 2024 14:45:58 +0000 (UTC) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH v2 8/8] gnu: bootloader: Add orangepi-zero2w bootloader. Date: Mon, 26 Aug 2024 16:45:07 +0200 Message-ID: <20240826144511.3770-8-herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240826144511.3770-1-herman@rimm.ee> References: <20240826144511.3770-1-herman@rimm.ee> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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- [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 TVD_RCVD_IP Message was received from an IP address 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 70131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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- [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 7888a4e030..7fd7288854 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 @@ -296,6 +297,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 69c0e0fcfd..3befa1adfd 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1178,6 +1178,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 14fa72bf7e..8af5867dfd 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1165,6 +1165,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")) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 19 06:51:49 2024 Received: (at 70131) by debbugs.gnu.org; 19 Sep 2024 10:51:49 +0000 Received: from localhost ([127.0.0.1]:59894 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srElJ-00077J-Kb for submit@debbugs.gnu.org; Thu, 19 Sep 2024 06:51:49 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:58099 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srElH-000771-1M for 70131@debbugs.gnu.org; Thu, 19 Sep 2024 06:51:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1726743082; 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: in-reply-to:in-reply-to:references:references; bh=aRmEm41O2jZ2967fstYnk7obacwCVM7xGEtz7ccj3Og=; b=R6vsBXGXSmv4bnHadl1iPDyH+qWgL5Q5GnYhn6VvreMnal8UamyRmF1yB8/HBUYagU9kZR zGGvZSdIQ44DttqId4M1mNGuN+ibHCWL239yk53Elmb95Ywpt5C2LRh727voH/QFkGWtFq vp3HUQln7Ao+mPQFUTfjVFv3r8CQvHTaQDDWCgFT8GYTtep683D2AcNRDjgX5yFsFHgpPB gaWhhTktNAAoV+iWD9006lyVMVAA57ywUQMD8KOnLYntefwlpj7QofaHdIc1BTRmtFnp7o aODQC+g1K+Ph+i7vBZ6sckA+iYzSq1G7M5PlVA1+FuYDat0LqjdXwN4qJJ+xcg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id f84162ca (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 19 Sep 2024 10:51:22 +0000 (UTC) Date: Thu, 19 Sep 2024 12:50:48 +0200 From: Herman Rimm To: 70131@debbugs.gnu.org Subject: Re: [bug#72987] [PATCH v2] gnu: u-boot: Enlarge space available for kernel. Message-ID: References: <20240902190459.13783-1-herman@rimm.ee> <87h6afl2y7.fsf@wireframe> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87h6afl2y7.fsf@wireframe> X-Spam-Score: 3.5 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, On Mon, Sep 16, 2024 at 02:10:40PM -0700, Vagrant Cascadian wrote: > u-boot is still only version 2024.01 in guix ... sorry I have lagged at > u-boot updates. > > > > base-commit: a493d65d04deafb76371 [...] Content analysis details: (3.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 TVD_RCVD_IP Message was received from an IP address -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 70131 Cc: Vagrant Cascadian X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.5 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, On Mon, Sep 16, 2024 at 02:10:40PM -0700, Vagrant Cascadian wrote: > u-boot is still only version 2024.01 in guix ... sorry I have lagged at > u-boot updates. > > > > base-commit: a493d65d04deafb76371 [...] Content analysis details: (2.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Hi, On Mon, Sep 16, 2024 at 02:10:40PM -0700, Vagrant Cascadian wrote: > u-boot is still only version 2024.01 in guix ... sorry I have lagged at > u-boot updates. > > > > base-commit: a493d65d04deafb763710bb1cb0425185750327d > > This appears to be from some branch not present in guix.... This patch can be applied on top of the v2 revision of issue 70131, I must not have CC'ed you that either. Cheers, Herman From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 20 17:53:58 2024 Received: (at 70131) by debbugs.gnu.org; 20 Sep 2024 21:53:58 +0000 Received: from localhost ([127.0.0.1]:36502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srlZe-0006mP-8x for submit@debbugs.gnu.org; Fri, 20 Sep 2024 17:53:58 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:41314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srlZc-0006m6-45; Fri, 20 Sep 2024 17:53:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1726869181; bh=Jmt2P9eiaUZHx6+Qz4VWAXcsTfr9DkhNxH9iufyvX0w=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=grO0jDYKg0Zp18ev3at+Z9MTCaRg9ENj6oY3Y+92ERko5XWn37FNGT+fZYnKoPsWv 8hf5oaMUUZk+RpaHL5BCqpH09w5A162r2RLSp4N5r1TnhINTml8NeIIfx8K7vQa8Dz v2CXW/GfUrijrBZWaMUQ/kfESPP+7u3DdFB01420x7CIYBb9BSEEHsknQ62KGBFgq8 uAcJ7fyzJuOdMP1MCoeeAYjiFXw2DedSeKmME4pWlZ+aVL8+vnU4LRBGdFcrILUGiC 6fLJPaoPfTHPg+JymLxIq/2ftSpnlkzZfhZDEKUWT3ZpjGJxB/wNn0zqjoogiiUrfT V1+nz6/SHgBfw== Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) by cascadia.aikidev.net (Postfix) with ESMTPSA id 470171757; Fri, 20 Sep 2024 14:53:01 -0700 (PDT) From: Vagrant Cascadian To: Herman Rimm , 70131@debbugs.gnu.org Subject: Re: [bug#70131] [bug#72987] [PATCH v2] gnu: u-boot: Enlarge space available for kernel. In-Reply-To: References: <20240902190459.13783-1-herman@rimm.ee> <87h6afl2y7.fsf@wireframe> Date: Fri, 20 Sep 2024 14:52:56 -0700 Message-ID: <87tteaj8lj.fsf@wireframe> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70131 Cc: 72987@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2024-09-19, Herman Rimm wrote: > On Mon, Sep 16, 2024 at 02:10:40PM -0700, Vagrant Cascadian wrote: >> u-boot is still only version 2024.01 in guix ... sorry I have lagged at >> u-boot updates. >>=20 >>=20 >> > base-commit: a493d65d04deafb763710bb1cb0425185750327d >>=20 >> This appears to be from some branch not present in guix.... > > This patch can be applied on top of the v2 revision of issue 70131, I > must not have CC'ed you that either. Or the bug you were replying to, done so now, so people know what is up. :) live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZu3uuAAKCRDcUY/If5cW qmy9AP42JJs23hOESglGuC/f/OzSOmfWLfs+fzNEhVU+xxhzVwD/YoJkX1L/32s5 x+iEVniDk0YzspfQqs9VGSpOLXEtcg8= =Tgfr -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 13 15:00:38 2024 Received: (at 70131) by debbugs.gnu.org; 13 Dec 2024 20:00:38 +0000 Received: from localhost ([127.0.0.1]:44183 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMBpw-0000od-FV for submit@debbugs.gnu.org; Fri, 13 Dec 2024 15:00:36 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:47741 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMBps-0000oH-6y for 70131@debbugs.gnu.org; Fri, 13 Dec 2024 15:00:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734120020; 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; bh=+zsrBzv8xg9XrOia2syw2Xb+qPcb7FLdYWuki/FGagI=; b=Mpm+HOr3HWdTRNo94Tmy61/YN/g+44fzBD3mTR6gMPHdISk860jZ7D345XZMEUO/48iFUE 3ALnXnJn7WMHeb3RrWJCAeQ9fhZuOjpd4icHq5yZ1nxxpylc7px1gbsfybha8aXmr1iuoC sRKKdrQpIBEBSSFi+eDqL76/sHbEEIWbnRO3HvYNVwRfFKb9iAHD5j5CWhLLDurBtpSCs+ fFi/HzY0w2dRkZkydhFZ90+Fg0Hs+5s0QoOV4w5PyOwsIZP4uOJxTtPAEKjfFAEpTxtmsP p3EH2wOdQiYu7ESdrdH66xzHXnjbkdfjQ2XnZmAhT810IgiVVSrmATi5GrxDZQ== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 157b890d (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Fri, 13 Dec 2024 20:00:20 +0000 (UTC) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH v3 0/6] Update U-Boot. Date: Fri, 13 Dec 2024 20:58:28 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello, The first and second patch should be applied together. The second patch updates U-Boot to v2024.10, and the patches for u-boot-rockpro64-rk3399 and u-boot-sandbox are updated and squashed into it. Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 TVD_RCVD_IP Message was received from an IP address 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in sa-accredit.habeas.com] 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in bl.score.senderscore.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 70131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello, The first and second patch should be applied together. The second patch updates U-Boot to v2024.10, and the patches for u-boot-rockpro64-rk3399 and u-boot-sandbox are updated and squashed into it. Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in sa-accredit.habeas.com] 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in bl.score.senderscore.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 T_SPF_TEMPERROR SPF: test of record failed (temperror) -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Hello, The first and second patch should be applied together. The second patch updates U-Boot to v2024.10, and the patches for u-boot-rockpro64-rk3399 and u-boot-sandbox are updated and squashed into it. I turned the ARM Trusted Firmware patch into #74849. The last patch of this series requires [PATCH 3/6] of #74849. I will submit the patches adding Nano Pi R4S, etc. support as part of #72987, in case they also work with future revisions of this series. The fourth patch is split off from [PATCH v2] of #72987. The third and fifth patches are completely new. Cheers, Herman Herman Rimm (6): Revert "gnu: u-boot-tools: Fix segfault while running tests." gnu: u-boot: Update to 2024.10. gnu: u-boot-tools: Remove extraneous native-input. gnu: u-boot: Use search-patches. gnu: bootloaders: u-boot-sandbox: Reformat. gnu: u-boot: Use guix-name. gnu/local.mk | 2 - gnu/packages/bootloaders.scm | 139 +++++++------- .../u-boot-allow-disabling-openssl.patch | 3 + .../u-boot-build-without-libcrypto.patch | 123 ------------- .../patches/u-boot-calloc-visibility.patch | 18 -- .../patches/u-boot-rockchip-inno-usb.patch | 171 ++---------------- 6 files changed, 80 insertions(+), 376 deletions(-) delete mode 100644 gnu/packages/patches/u-boot-build-without-libcrypto.patch delete mode 100644 gnu/packages/patches/u-boot-calloc-visibility.patch base-commit: 0787a180b3ca64d3958438920ca1b58a2a27fba4 -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 13 15:00:39 2024 Received: (at 70131) by debbugs.gnu.org; 13 Dec 2024 20:00:39 +0000 Received: from localhost ([127.0.0.1]:44188 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMBq2-0000ow-09 for submit@debbugs.gnu.org; Fri, 13 Dec 2024 15:00:39 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:47741 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMBpu-0000oH-Ks for 70131@debbugs.gnu.org; Fri, 13 Dec 2024 15:00:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734120021; 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=6Kq0zQWdDGQhExQw8p66P5u0Tn8Xzf4uY4J8gjjTavA=; b=DEplX0OGTnq2c0oTozLpy5sB5vTPrgFNSm3FargS9fCLn/Lm8dvLOfrW8ostQbJGlBPByw wRRMJ4z14dAAe1TWb7pC09RHEwcZ6gr523leOo1pJGoPKUV3ywxbnkZU1tSzA6DRAevq9D D7e8gjQYxybtgNCotsFc+nhx1L7YdMrwiy/8znZr/8JLT8F+/B3Alo2rK9WecW10g46Ncv qrbHkUSgADnXClgtjp01V1ezw4EbaWgrgQAY6AunadxZpGen74qDiviiRN1KK8JglAAKKL LbwlDV2ahf3C4Qw2YUbKcz86KFk4Rv7WfOxyZvlZDUXI1EKNEVzJbmn1N9xqIA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 564c567c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Fri, 13 Dec 2024 20:00:21 +0000 (UTC) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH v3 1/6] Revert "gnu: u-boot-tools: Fix segfault while running tests." Date: Fri, 13 Dec 2024 20:58:29 +0100 Message-ID: <22290a3d8e785aadcd5e2a044d68001b8f0f30df.1734118924.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This reverts commit e526b8b11debb184929abd013b7d589c9db245fa. --- gnu/local.mk | 1 - gnu/packages/bootloaders.scm | 3 +-- .../patches/u-boot-calloc-visibility.patch | 18 3 files cha [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in sa-accredit.habeas.com] 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in bl.score.senderscore.com] 0.0 TVD_RCVD_IP Message was received from an IP address 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 70131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This reverts commit e526b8b11debb184929abd013b7d589c9db245fa. --- gnu/local.mk | 1 - gnu/packages/bootloaders.scm | 3 +-- .../patches/u-boot-calloc-visibility.patch | 18 3 files cha [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in sa-accredit.habeas.com] 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in bl.score.senderscore.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager This reverts commit e526b8b11debb184929abd013b7d589c9db245fa. --- gnu/local.mk | 1 - gnu/packages/bootloaders.scm | 3 +-- .../patches/u-boot-calloc-visibility.patch | 18 ------------------ 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 gnu/packages/patches/u-boot-calloc-visibility.patch diff --git a/gnu/local.mk b/gnu/local.mk index 39b142af5a..14b8c6932e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2275,7 +2275,6 @@ dist_patch_DATA = \ %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-calloc-visibility.patch \ %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ %D%/packages/patches/u-boot-rockchip-inno-usb.patch \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 788c7dc9ef..db2cfd1131 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -766,8 +766,7 @@ (define u-boot (patches (list %u-boot-rockchip-inno-usb-patch %u-boot-build-without-libcrypto-patch - %u-boot-allow-disabling-openssl-patch - (search-patch "u-boot-calloc-visibility.patch"))) + %u-boot-allow-disabling-openssl-patch)) (method url-fetch) (uri (string-append "https://ftp.denx.de/pub/u-boot/" diff --git a/gnu/packages/patches/u-boot-calloc-visibility.patch b/gnu/packages/patches/u-boot-calloc-visibility.patch deleted file mode 100644 index 93c52ff709..0000000000 --- a/gnu/packages/patches/u-boot-calloc-visibility.patch +++ /dev/null @@ -1,18 +0,0 @@ -Arrange so that LLVM's shared object doesn't end up using 'calloc' from -U-Boot's 'malloc_simple.c' when it's initialized. - - https://issues.guix.gnu.org/74270 - -diff --git a/common/malloc_simple.c b/common/malloc_simple.c -index 5a8ec538f8..4f5e350a3c 100644 ---- a/common/malloc_simple.c -+++ b/common/malloc_simple.c -@@ -64,6 +64,8 @@ void *memalign_simple(size_t align, size_t bytes) - } - - #if CONFIG_IS_ENABLED(SYS_MALLOC_SIMPLE) -+void *calloc(size_t nmemb, size_t elem_size) -+ __attribute__ ((visibility ("hidden"))); - void *calloc(size_t nmemb, size_t elem_size) - { - size_t size = nmemb * elem_size; -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 13 15:00:45 2024 Received: (at 70131) by debbugs.gnu.org; 13 Dec 2024 20:00:45 +0000 Received: from localhost ([127.0.0.1]:44192 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMBq4-0000pY-Ay for submit@debbugs.gnu.org; Fri, 13 Dec 2024 15:00:45 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:54769 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMBpx-0000oQ-FJ for 70131@debbugs.gnu.org; Fri, 13 Dec 2024 15:00:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734120021; 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=KneUwIZE7YMXQPkOtu/yQsg2LmCKeQfhgSCzNrvASdw=; b=ZrdIX66x+oUfUCHq+8NIL4yd3DwB13AZGjBYkqyHh1E+OeGfJZbjrTi5qbdm8xd+HUvbwI JlcEmRK0KHLaxMRYdJb/9J54DcMyhViLFF2XN+QovjQPQyKQTKq3EqewNzxVCp7JinMnEt 8JuzSpCRJ4TTB3fQCezwBmIAFkRAUL94bZu29Q8AEUOVlVRYYbxTyytl5GGHCkaUWCLg1x sV4O7ROthhouQk1iXEbymOiZph2cSNs5fNKLGGBWknFSUw19OtmVsd4wXNDbK1EExNr5zl +TmRGffvPILdXyyn00QUQ2h/L1d+p/5WXEXvo46aRfx14fdYc1cZM+rdGaLphA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 4fe6f93b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Fri, 13 Dec 2024 20:00:21 +0000 (UTC) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH v3 2/6] gnu: u-boot: Update to 2024.10. Date: Fri, 13 Dec 2024 20:58:30 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/bootloaders.scm (u-boot): Update to 2024.10. [source]: Remove build-without-libcrypto patch. Use git-fetch. (%u-boot-build-without-libcrypto-patch): Remove variable. (u-boot-tools)[argu [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in sa-accredit.habeas.com] 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in bl.score.senderscore.com] 0.0 TVD_RCVD_IP Message was received from an IP address 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 70131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/bootloaders.scm (u-boot): Update to 2024.10. [source]: Remove build-without-libcrypto patch. Use git-fetch. (%u-boot-build-without-libcrypto-patch): Remove variable. (u-boot-tools)[argu [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in sa-accredit.habeas.com] 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in bl.score.senderscore.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/bootloaders.scm (u-boot): Update to 2024.10. [source]: Remove build-without-libcrypto patch. Use git-fetch. (%u-boot-build-without-libcrypto-patch): Remove variable. (u-boot-tools)[arguments]: Enable test_spl. Disable sandbox tests and kwbimage. (python-u-boot-pylib)[arguments]: Add phase to fix build file. (make-u-boot-package)[arguments]: Disable kwbimage. (u-boot-sandbox): Only keep CONFIG_FIT_CIPHER disabled. [inputs]: Add efitools. (u-boot-rockpro64-rk3399): Replace CONFIG_DM_SCSI with CONFIG_SCSI. * gnu/packages/patches/u-boot-build-without-libcrypto.patch: Delete. * gnu/local.mk (dist_patch_DATA): Remove patch. Change-Id: I07cb0df0431ed45af0beb05105ae948136dd9eb3 --- gnu/local.mk | 1 - gnu/packages/bootloaders.scm | 66 +++++----- .../u-boot-build-without-libcrypto.patch | 123 ------------------ 3 files changed, 32 insertions(+), 158 deletions(-) delete mode 100644 gnu/packages/patches/u-boot-build-without-libcrypto.patch diff --git a/gnu/local.mk b/gnu/local.mk index 14b8c6932e..ace19eb8a4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2274,7 +2274,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/ucx-tcp-iface-ioctl.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index db2cfd1131..584a285c61 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -54,6 +54,7 @@ (define-module (gnu packages bootloaders) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages guile) + #:use-module (gnu packages efi) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages man) @@ -754,26 +755,22 @@ (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 (package (name "u-boot") - (version "2024.01") + (version "2024.10") (source (origin (patches (list %u-boot-rockchip-inno-usb-patch - %u-boot-build-without-libcrypto-patch %u-boot-allow-disabling-openssl-patch)) - (method url-fetch) - (uri (string-append - "https://ftp.denx.de/pub/u-boot/" - "u-boot-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://source.denx.de/u-boot/u-boot.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1czmpszalc6b8cj9j7q6cxcy19lnijv3916w3dag6yr3xpqi35mr")))) + "0yrhb0izihv47p781dc4cp0znc5g225ayl7anz23c6jdrmfbpz2h")))) (build-system gnu-build-system) (native-inputs (list bison @@ -870,9 +867,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\"") @@ -895,14 +894,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"))) @@ -968,6 +969,13 @@ (define-public python-u-boot-pylib (add-after 'unpack 'chdir (lambda _ (chdir "tools/u_boot_pylib"))) + (add-after 'chdir 'list-package + (lambda _ + (let ((port (open-file "pyproject.toml" "a"))) + (display "[tool.setuptools.packages.find]\n" port) + (display "where = [\"..\"]\n" port) + (display "include = [\"u_boot_pylib*\"]" port) + (close-port port)))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -1114,7 +1122,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")) @@ -1322,21 +1331,10 @@ (define-public u-boot-qemu-riscv64-smode (define-public u-boot-sandbox (let ((base (make-u-boot-package "sandbox" #f ;build for the native system - ;; Disable CONFIG_TOOLS_LIBCRYPTO, CONFIG_FIT_SIGNATURE and - ;; CONFIG_FIT_CIPHER and their selectors as these features - ;; require OpenSSL, which is incompatible with the GPLv2-only - ;; parts of U-boot. The options below replicate the changes - ;; that disabling the above features in 'make menuconfig' then - ;; refreshing the defconfig with 'make savedefconfig' would do. - #:configs (list "# CONFIG_FIT_RSASSA_PSS is not set" - "# CONFIG_FIT_CIPHER is not set" - "# CONFIG_LEGACY_IMAGE_FORMAT is not set" - "# CONFIG_IMAGE_PRE_LOAD is not set" - "# CONFIG_IMAGE_PRE_LOAD_SIG is not set" - "# CONFIG_CMD_BOOTM_PRE_LOAD is not set" - "CONFIG_RSA=y" - "# CONFIG_EFI_SECURE_BOOT is not set" - "# CONFIG_TOOLS_LIBCRYPTO is not set") + ;; These disabled features require OpenSSL, which is + ;; incompatible with the GPLv2-only parts of U-boot. + #:configs (map (cut string-append "# CONFIG_" <> " is not set") + '("FIT_CIPHER")) #:append-description "The sandbox configuration of U-Boot provides a @command{u-boot} command that runs as a normal user space application. It can @@ -1356,8 +1354,9 @@ (define-public u-boot-sandbox (mkdir (string-append #$output "/bin")) (symlink (search-input-file outputs "libexec/u-boot") (string-append #$output "/bin/u-boot")))))))) + ;; cert-to-efi-sig-list from efitools creates the EFI capsule ESL. (inputs (modify-inputs (package-inputs base) - (append sdl2)))))) + (append efitools sdl2)))))) (define-public u-boot-sifive-unleashed (let ((base (make-u-boot-package "sifive_unleashed" "riscv64-linux-gnu"))) @@ -1457,7 +1456,6 @@ (define-public u-boot-rockpro64-rk3399 "CONFIG_SATA_SIL=y" "CONFIG_SCSI=y" "CONFIG_SCSI_AHCI=y" - "CONFIG_DM_SCSI=y" ;; Disable SPL FIT signatures, ;; due to GPLv2 and Openssl ;; license incompatibilities 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 - -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 13 15:00:50 2024 Received: (at 70131) by debbugs.gnu.org; 13 Dec 2024 20:00:50 +0000 Received: from localhost ([127.0.0.1]:44194 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMBq9-0000ph-7Q for submit@debbugs.gnu.org; Fri, 13 Dec 2024 15:00:49 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:47741 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMBpz-0000oH-6Z for 70131@debbugs.gnu.org; Fri, 13 Dec 2024 15:00:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734120023; 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=w87yS3AFJD83VwOopkRa7lpG5nLqQu5R4CyoULreFWQ=; b=KYGII6fBJ4W+ksGx0eKUWZ3zNTHYQeZB+MFh546qSNVLEMaY1tebmITVn96NMaZnuAnc+Z MZ/Wbgpbhou2A+51jVde4og8mbSFtthJlNmZynpXv4FkR0lGU+zzpQIqcmjpyMKp7CYBuE NhrRHmhhhj+9X2Mz0dr5+lfpa62WNuWGIHKLj2oYoCs/2w7ZozBbFbQoZhc32wgmZbRTwv 9OqPr8k6O+ePfvE39JnM7SNZQN68ejJlQpKS1kS6wAkEi+TycVitUcbpvAHPmMqUPUxzrJ F2bYkKsss1zPBLel0UtZvLNtlFUyZwrBWkuKyHRhtXfSNBW2YK/V72DD3C0f5w== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 0a864442 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Fri, 13 Dec 2024 20:00:23 +0000 (UTC) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH v3 3/6] gnu: u-boot-tools: Remove extraneous native-input. Date: Fri, 13 Dec 2024 20:58:31 +0100 Message-ID: <571274ce3735d7a34e42f47c58ab8339a2aba4a0.1734118924.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/package/bootloaders.scm (u-boot-tools)[native-inputs]: Remove sdl2. Change-Id: I14d8a605f5e7232f6047ddccfcbd0249ee4b661c --- gnu/packages/bootloaders.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in sa-accredit.habeas.com] 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in bl.score.senderscore.com] 0.0 TVD_RCVD_IP Message was received from an IP address 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 70131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/package/bootloaders.scm (u-boot-tools)[native-inputs]: Remove sdl2. Change-Id: I14d8a605f5e7232f6047ddccfcbd0249ee4b661c --- gnu/packages/bootloaders.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in sa-accredit.habeas.com] 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in bl.score.senderscore.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/package/bootloaders.scm (u-boot-tools)[native-inputs]: Remove sdl2. Change-Id: I14d8a605f5e7232f6047ddccfcbd0249ee4b661c --- gnu/packages/bootloaders.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 584a285c61..2a3ca30046 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -838,8 +838,7 @@ (define-public u-boot-tools python-filelock python-pycryptodomex python-pytest - python-pytest-xdist - sdl2))) + python-pytest-xdist))) (arguments `(#:make-flags '("HOSTCC=gcc") #:test-target "tcheck" -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 13 15:00:53 2024 Received: (at 70131) by debbugs.gnu.org; 13 Dec 2024 20:00:53 +0000 Received: from localhost ([127.0.0.1]:44196 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMBqE-0000q0-9T for submit@debbugs.gnu.org; Fri, 13 Dec 2024 15:00:53 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:54769 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMBq0-0000oQ-IC for 70131@debbugs.gnu.org; Fri, 13 Dec 2024 15:00:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734120024; 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=49Zm8AvkAkPgBm87zLYEWc/EdCHTph1IVDhVqdxStz0=; b=oUP2L7EQ2WUr9UuTAUf4Bn7Fu/ep9hkE9RYMtncCO6B/ryAYa5cXTH5IaWhAsSRjfTSFs0 yAVeBRkwALZWNKbA5XabmAijxt/jmt7oJu1XfzreiCfWYJA00jsu935O56TaMnredwTUNd +ljW/W9grL7DRVR3G5Vs3qem3u6MtZI8k+3dbqO2BdxwxbkKa3jGKc9RTkp4mIUfiOgKuS IE+JtbkEHDLNXOFp1fTS7zy6Y+tOC1Orv4e8aD08tsNt/LRKHSqmuwY4CYDKabF516qDiA maeFapvz7UXkMpeofC+Ck3H5R3nB7QH7Sa+SJjl7zPplrA/EpvOqLzNcFpwWRg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 9bb00be1 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Fri, 13 Dec 2024 20:00:23 +0000 (UTC) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH v3 4/6] gnu: u-boot: Use search-patches. Date: Fri, 13 Dec 2024 20:58:32 +0100 Message-ID: <4518d704ed2219de4db596ef63867512f571c7e9.1734118924.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/bootloaders.scm (%u-boot-rockchip-inno-usb-patch, %u-boot-allow-disabling-openssl-patch): Remove variables, move comments. (u-boot)[source]: Use search-patches. * gnu/packages/patches/u [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in sa-accredit.habeas.com] 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in bl.score.senderscore.com] 0.0 TVD_RCVD_IP Message was received from an IP address 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 70131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/bootloaders.scm (%u-boot-rockchip-inno-usb-patch, %u-boot-allow-disabling-openssl-patch): Remove variables, move comments. (u-boot)[source]: Use search-patches. * gnu/packages/patches/u [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in sa-accredit.habeas.com] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in bl.score.senderscore.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/bootloaders.scm (%u-boot-rockchip-inno-usb-patch, %u-boot-allow-disabling-openssl-patch): Remove variables, move comments. (u-boot)[source]: Use search-patches. * gnu/packages/patches/u-boot-allow-disabling-openssl.patch: Comment. * gnu/packages/patches/u-boot-rockchip-inno-usb.patch: Remove E-Mail metadata. Replace diffstat with comments. Reapply to U-Boot v2024.10. Change-Id: I760a2e81bddfc2a80ef149fe1ac4496cbbd937a0 --- gnu/packages/bootloaders.scm | 34 ++-- .../u-boot-allow-disabling-openssl.patch | 3 + .../patches/u-boot-rockchip-inno-usb.patch | 171 ++---------------- 3 files changed, 30 insertions(+), 178 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 2a3ca30046..ca189fca3a 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -744,33 +744,21 @@ (define-public dtc tree binary files. These are board description files used by Linux and BSD.") (license license:gpl2+))) -(define %u-boot-rockchip-inno-usb-patch - ;; Fix regression in 2020.10 causing freezes on boot with USB boot enabled. - ;; See https://gitlab.manjaro.org/manjaro-arm/packages/core/uboot-rockpro64/-/issues/4 - ;; and https://patchwork.ozlabs.org/project/uboot/patch/20210406151059.1187379-1-icenowy@aosc.io - (search-patch "u-boot-rockchip-inno-usb.patch")) - -(define %u-boot-allow-disabling-openssl-patch - ;; Fixes build of u-boot 2021.10 without openssl - ;; https://lists.denx.de/pipermail/u-boot/2021-October/462728.html - (search-patch "u-boot-allow-disabling-openssl.patch")) - (define u-boot (package (name "u-boot") (version "2024.10") - (source (origin - (patches - (list %u-boot-rockchip-inno-usb-patch - %u-boot-allow-disabling-openssl-patch)) - (method git-fetch) - (uri (git-reference - (url "https://source.denx.de/u-boot/u-boot.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0yrhb0izihv47p781dc4cp0znc5g225ayl7anz23c6jdrmfbpz2h")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://source.denx.de/u-boot/u-boot.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yrhb0izihv47p781dc4cp0znc5g225ayl7anz23c6jdrmfbpz2h")) + (patches (search-patches "u-boot-allow-disabling-openssl.patch" + "u-boot-rockchip-inno-usb.patch")))) (build-system gnu-build-system) (native-inputs (list bison diff --git a/gnu/packages/patches/u-boot-allow-disabling-openssl.patch b/gnu/packages/patches/u-boot-allow-disabling-openssl.patch index 9201f9a51d..308424e1a4 100644 --- a/gnu/packages/patches/u-boot-allow-disabling-openssl.patch +++ b/gnu/packages/patches/u-boot-allow-disabling-openssl.patch @@ -10,6 +10,9 @@ CONFIG_FIT_PRELOAD to remove fit_pre_load_data, which depends on openssl. Addendum 2024-01-18, Herman Rimm: Patch updated to leave out upstreamed diffs with CONFIG_FIT_PRELOAD. +--- +Fixes build of U-Boot v2021.10 without openssl. See: +https://lists.denx.de/pipermail/u-boot/2021-October/462728.html diff --git a/tools/kwbimage.c b/tools/kwbimage.c index 4dce495ff0..976174ae77 100644 diff --git a/gnu/packages/patches/u-boot-rockchip-inno-usb.patch b/gnu/packages/patches/u-boot-rockchip-inno-usb.patch index eeb25f4b89..5962e19e01 100644 --- a/gnu/packages/patches/u-boot-rockchip-inno-usb.patch +++ b/gnu/packages/patches/u-boot-rockchip-inno-usb.patch @@ -1,149 +1,7 @@ -Downloaded from: -https://patchwork.ozlabs.org/project/uboot/patch/20210406151059.1187379-1-icenowy@aosc.io - -From patchwork Tue Apr 6 15:10:59 2021 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Icenowy Zheng -X-Patchwork-Id: 1462876 -X-Patchwork-Delegate: ykai007@gmail.com -Return-Path: -X-Original-To: incoming@patchwork.ozlabs.org -Delivered-To: patchwork-incoming@bilbo.ozlabs.org -Authentication-Results: ozlabs.org; - spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de - (client-ip=85.214.62.61; helo=phobos.denx.de; - envelope-from=u-boot-bounces@lists.denx.de; receiver=) -Authentication-Results: ozlabs.org; - dkim=fail reason="signature verification failed" (1024-bit key; - unprotected) header.d=mymailcheap.com header.i=@mymailcheap.com - header.a=rsa-sha256 header.s=default header.b=unszVtqT; - dkim=fail reason="signature verification failed" (1024-bit key; - unprotected) header.d=aosc.io header.i=@aosc.io header.a=rsa-sha256 - header.s=default header.b=mWwYCh9A; - dkim-atps=neutral -Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) - (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) - key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest - SHA256) - (No client certificate requested) - by ozlabs.org (Postfix) with ESMTPS id 4FF9wc3GdNz9sW1 - for ; Wed, 7 Apr 2021 01:11:42 +1000 (AEST) -Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) - by phobos.denx.de (Postfix) with ESMTP id C1F9C8040A; - Tue, 6 Apr 2021 17:11:32 +0200 (CEST) -Authentication-Results: phobos.denx.de; - dmarc=none (p=none dis=none) header.from=aosc.io -Authentication-Results: phobos.denx.de; - spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de -Authentication-Results: phobos.denx.de; - dkim=fail reason="signature verification failed" (1024-bit key; - unprotected) header.d=mymailcheap.com header.i=@mymailcheap.com - header.b="unszVtqT"; - dkim=fail reason="signature verification failed" (1024-bit key; - unprotected) header.d=aosc.io header.i=@aosc.io header.b="mWwYCh9A"; - dkim-atps=neutral -Received: by phobos.denx.de (Postfix, from userid 109) - id E4F22805B4; Tue, 6 Apr 2021 17:11:30 +0200 (CEST) -X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de -X-Spam-Level: -X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, - DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=ham - autolearn_force=no version=3.4.2 -Received: from relay3.mymailcheap.com (relay3.mymailcheap.com - [217.182.66.161]) - (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) - (No client certificate requested) - by phobos.denx.de (Postfix) with ESMTPS id 2FC4A8039D - for ; Tue, 6 Apr 2021 17:11:27 +0200 (CEST) -Authentication-Results: phobos.denx.de; - dmarc=none (p=none dis=none) header.from=aosc.io -Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=icenowy@aosc.io -Received: from filter2.mymailcheap.com (filter2.mymailcheap.com - [91.134.140.82]) - by relay3.mymailcheap.com (Postfix) with ESMTPS id A6AC13ECDF; - Tue, 6 Apr 2021 17:11:26 +0200 (CEST) -Received: from localhost (localhost [127.0.0.1]) - by filter2.mymailcheap.com (Postfix) with ESMTP id 88D512A915; - Tue, 6 Apr 2021 17:11:26 +0200 (CEST) -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mymailcheap.com; - s=default; t=1617721886; - bh=qb5gt5o7M9qjdJd67A3WHGZp/76w4s4FS6+u1VuEh/o=; - h=From:To:Cc:Subject:Date:From; - b=unszVtqTnO9MGZVbgLH5H0cMo3VfQ+g5377blmOUcrtzMSqNbDD5SM25MUhlTUKiB - hTFq4L53gszBYfRPfh7Z5XgNVERULL5Zx0+WnVjZ7kUIp/wS3IQqxe81ChoFEsLTr8 - 22UB9NN3OSVkuN/jRAzX+lKpugVGBHwOCjZBZukQ= -Received: from filter2.mymailcheap.com ([127.0.0.1]) - by localhost (filter2.mymailcheap.com [127.0.0.1]) (amavisd-new, port 10024) - with ESMTP id V9lVOgo6gApH; Tue, 6 Apr 2021 17:11:25 +0200 (CEST) -Received: from mail20.mymailcheap.com (mail20.mymailcheap.com [51.83.111.147]) - (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) - (No client certificate requested) - by filter2.mymailcheap.com (Postfix) with ESMTPS; - Tue, 6 Apr 2021 17:11:25 +0200 (CEST) -Received: from [213.133.102.83] (ml.mymailcheap.com [213.133.102.83]) - by mail20.mymailcheap.com (Postfix) with ESMTP id C9EA3400B6; - Tue, 6 Apr 2021 15:11:24 +0000 (UTC) -Authentication-Results: mail20.mymailcheap.com; dkim=pass (1024-bit key; - unprotected) header.d=aosc.io header.i=@aosc.io header.b="mWwYCh9A"; - dkim-atps=neutral -AI-Spam-Status: Not processed -Received: from ice-e5v2.lan (unknown [59.41.163.135]) - (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) - key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest - SHA256) (No client certificate requested) - by mail20.mymailcheap.com (Postfix) with ESMTPSA id 251F840C16; - Tue, 6 Apr 2021 15:11:10 +0000 (UTC) -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=aosc.io; s=default; - t=1617721874; bh=qb5gt5o7M9qjdJd67A3WHGZp/76w4s4FS6+u1VuEh/o=; - h=From:To:Cc:Subject:Date:From; - b=mWwYCh9AM8eRWm9hiEqirytotj/G/C1p9r2fd0zUxPhS0UQH+kw6L3RWZnsfmXAYq - HmYFiM3ktIfwevqQw89tOi8c2ktb49iYOyHXkfi8hTZl1dNsJDS94uyzBiHYY+U7x5 - P0aTRRaL5C8ua2c1GedoPx06nrARO/KMEFy39rxI= From: Icenowy Zheng -To: Simon Glass , Kever Yang , - Frank Wang , - Jagan Teki -Cc: u-boot@lists.denx.de, - Icenowy Zheng +Date: Tue, 6 Apr 2021 23:10:59 +0800 Subject: [PATCH] phy: rockchip: inno-usb2: fix hang when multiple controllers exit -Date: Tue, 6 Apr 2021 23:10:59 +0800 -Message-Id: <20210406151059.1187379-1-icenowy@aosc.io> -X-Mailer: git-send-email 2.30.2 -MIME-Version: 1.0 -X-Rspamd-Server: mail20.mymailcheap.com -X-Spamd-Result: default: False [4.90 / 20.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; - ARC_NA(0.00)[]; R_DKIM_ALLOW(0.00)[aosc.io:s=default]; - RECEIVED_SPAMHAUS_PBL(0.00)[59.41.163.135:received]; - FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; - R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; - MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[aosc.io]; - BROKEN_CONTENT_TYPE(1.50)[]; R_SPF_SOFTFAIL(0.00)[~all]; - RCPT_COUNT_FIVE(0.00)[6]; ML_SERVERS(-3.10)[213.133.102.83]; - DKIM_TRACE(0.00)[aosc.io:+]; MID_CONTAINS_FROM(1.00)[]; - RCVD_NO_TLS_LAST(0.10)[]; FROM_EQ_ENVFROM(0.00)[]; - MIME_TRACE(0.00)[0:+]; - ASN(0.00)[asn:24940, ipnet:213.133.96.0/19, country:DE]; - RCVD_COUNT_TWO(0.00)[2]; - HFILTER_HELO_BAREIP(3.00)[213.133.102.83,1] -X-Rspamd-Queue-Id: C9EA3400B6 -X-BeenThere: u-boot@lists.denx.de -X-Mailman-Version: 2.1.34 -Precedence: list -List-Id: U-Boot discussion -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -Errors-To: u-boot-bounces@lists.denx.de -Sender: "U-Boot" -X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de -X-Virus-Status: Clean The OHCI and EHCI controllers are both bound to the same PHY. They will both do init and power_on operations when the controller is brought up @@ -166,23 +24,26 @@ Signed-off-by: Icenowy Zheng Fixes: ac97a9ece14e ("phy: rockchip: Add Rockchip USB2PHY driver") Tested-by: Peter Robinson --- - drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 21 +++++++++++++++++++ - 1 file changed, 21 insertions(+) +Fix U-Boot v2020.10 regression, freezing on boot with USB boot enabled: +https://gitlab.manjaro.org/manjaro-arm/packages/core/uboot-rockpro64/-/issues/4 + +Downloaded from: +https://patchwork.ozlabs.org/project/uboot/patch/20210406151059.1187379-1-icenowy@aosc.io diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c -index 70e61eccb7..ce36db94a7 100644 +index 43f6e020a6a..2086192445d 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c -@@ -64,6 +64,8 @@ struct rockchip_usb2phy { - void *reg_base; +@@ -47,6 +47,8 @@ struct rockchip_usb2phy { + struct regmap *reg_base; struct clk phyclk; const struct rockchip_usb2phy_cfg *phy_cfg; + int init_count; + int power_on_count; }; - static inline int property_enable(void *reg_base, -@@ -106,6 +108,10 @@ static int rockchip_usb2phy_power_on(struct phy *phy) + static inline int property_enable(struct regmap *base, +@@ -98,6 +100,10 @@ static int rockchip_usb2phy_power_on(struct phy *phy) struct rockchip_usb2phy *priv = dev_get_priv(parent); const struct rockchip_usb2phy_port_cfg *port_cfg = us2phy_get_port(phy); @@ -193,7 +54,7 @@ index 70e61eccb7..ce36db94a7 100644 property_enable(priv->reg_base, &port_cfg->phy_sus, false); /* waiting for the utmi_clk to become stable */ -@@ -120,6 +126,10 @@ static int rockchip_usb2phy_power_off(struct phy *phy) +@@ -112,6 +118,10 @@ static int rockchip_usb2phy_power_off(struct phy *phy) struct rockchip_usb2phy *priv = dev_get_priv(parent); const struct rockchip_usb2phy_port_cfg *port_cfg = us2phy_get_port(phy); @@ -204,8 +65,8 @@ index 70e61eccb7..ce36db94a7 100644 property_enable(priv->reg_base, &port_cfg->phy_sus, true); return 0; -@@ -132,6 +142,10 @@ static int rockchip_usb2phy_init(struct phy *phy) - const struct rockchip_usb2phy_port_cfg *port_cfg = us2phy_get_port(phy); +@@ -123,6 +133,10 @@ static int rockchip_usb2phy_init(struct phy *phy) + struct rockchip_usb2phy *priv = dev_get_priv(parent); int ret; + priv->init_count++; @@ -215,7 +76,7 @@ index 70e61eccb7..ce36db94a7 100644 ret = clk_enable(&priv->phyclk); if (ret && ret != -ENOSYS) { dev_err(phy->dev, "failed to enable phyclk (ret=%d)\n", ret); -@@ -154,6 +168,10 @@ static int rockchip_usb2phy_exit(struct phy *phy) +@@ -137,6 +151,10 @@ static int rockchip_usb2phy_exit(struct phy *phy) struct udevice *parent = dev_get_parent(phy->dev); struct rockchip_usb2phy *priv = dev_get_priv(parent); @@ -226,7 +87,7 @@ index 70e61eccb7..ce36db94a7 100644 clk_disable(&priv->phyclk); return 0; -@@ -294,6 +312,9 @@ static int rockchip_usb2phy_probe(struct udevice *dev) +@@ -281,6 +299,9 @@ static int rockchip_usb2phy_probe(struct udevice *dev) return ret; } -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 13 15:00:54 2024 Received: (at 70131) by debbugs.gnu.org; 13 Dec 2024 20:00:54 +0000 Received: from localhost ([127.0.0.1]:44198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMBqH-0000q8-ST for submit@debbugs.gnu.org; Fri, 13 Dec 2024 15:00:54 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:47741 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMBq2-0000oH-VR for 70131@debbugs.gnu.org; Fri, 13 Dec 2024 15:00:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734120024; 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=uUDew/oXCHMSZdvbgXKAs0a2TqF69eoasCNlGnVTR0U=; b=S9Y4b55E/XXOS63HGfqbdJVOppTiSyzLTxAN1yomq2mMO1U6+daxKkNUvYnmzZXAI/SL5I BBwJCIe55Q6Ztv2pjK0Yd0zhbGzu5fNKXdnnVEAz1MlUtPPX7mvRfS4lnf6i2LFdt4LT6E nPzsr2QGzlsP64UTvOWK4RSGfREEkjRzRcjIQUU5Nex6kK+2TkAeBlERRWa/lHZBhvuZDD B05fH3ODgXUF+K+7MIN10k+8521m2B82Gd2AA8u/UDpvgLmEroLNvytLec8Cd7mB3O3CTZ 9wKNsCIGziQ3d63Z3bLZZ8CDt2yRxt53T96VB6oaPzqVh5XgFq+M7i/66pmYPw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id ff30235e (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Fri, 13 Dec 2024 20:00:24 +0000 (UTC) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH v3 6/6] gnu: u-boot: Use guix-name. Date: Fri, 13 Dec 2024 20:58:34 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/bootloaders.scm (u-boot): Use guix-name. Change-Id: I7226519a676ba201be3a95078112b6514a201731 --- gnu/packages/bootloaders.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 521e0d5bcd..a0deecbfb5 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1038,9 +1038,7 @@ [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in sa-accredit.habeas.com] 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in bl.score.senderscore.com] 0.0 TVD_RCVD_IP Message was received from an IP address 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 70131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/bootloaders.scm (u-boot): Use guix-name. Change-Id: I7226519a676ba201be3a95078112b6514a201731 --- gnu/packages/bootloaders.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 521e0d5bcd..a0deecbfb5 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1038,9 +1038,7 @@ [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in sa-accredit.habeas.com] 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in bl.score.senderscore.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/bootloaders.scm (u-boot): Use guix-name. Change-Id: I7226519a676ba201be3a95078112b6514a201731 --- gnu/packages/bootloaders.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 521e0d5bcd..a0deecbfb5 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1038,9 +1038,7 @@ (define*-public (make-u-boot-package board triplet (gnu-triplet->nix-system triplet)))))) (package (inherit u-boot) - (name (string-append "u-boot-" - (string-replace-substring (string-downcase board) - "_" "-") + (name (string-append (guix-name "u-boot-" board) (or name-suffix ""))) (description (if append-description (string-append (package-description u-boot) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 13 15:00:54 2024 Received: (at 70131) by debbugs.gnu.org; 13 Dec 2024 20:00:54 +0000 Received: from localhost ([127.0.0.1]:44200 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMBqI-0000qF-9M for submit@debbugs.gnu.org; Fri, 13 Dec 2024 15:00:54 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:39687 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMBq2-0000of-PG for 70131@debbugs.gnu.org; Fri, 13 Dec 2024 15:00:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734120024; 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=xKJQ24onggptO723pi5DM/oD83E9qBaE2GyZj+XrvBg=; b=J9OdBiypcln48QJyu51vmk8TIaYBB8hZ8rhUSiTN8xgGDBuBgsJ6xuNvAX0HHkpJTGffDp J6Exx/wwPKcE/FHxRgOzenmWJ3vf+YN4JaQcuCMT/FocwHKuxd4cjgFQWnxrCYvGOQu+dH awvBnCclZe/15IiTjuwIF8CyxoxuvM2OzhUvBjNaWW04wfZPcSwQAtWe0zUVG/DsMefwV5 xNApmLHJF7+ilrYgcidr+iaKbj2ZwVUBUX5gk1ozvwH1+9k9yY0x1nyF56Xz1vAiaVOMEP vEvBHIVoR6mpL0l/vW7yIHlOhpcT0MykkUrjoGGGoaTGMRn1KyJ5Cn/q3Opg8w== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 40a3ba75 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Fri, 13 Dec 2024 20:00:24 +0000 (UTC) From: Herman Rimm To: 70131@debbugs.gnu.org Subject: [PATCH v3 5/6] gnu: bootloaders: u-boot-sandbox: Reformat. Date: Fri, 13 Dec 2024 20:58:33 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/bootloaders.scm (u-boot-sandbox): Wrap at 72 columns. Change-Id: I440c05b369c0be1437a3174e055efeeda8e5fe01 --- gnu/packages/bootloaders.scm | 55 ++++++++++++++++++ 1 file changed, 28 insertions(+), 27 deletions(-) Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in sa-accredit.habeas.com] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in bl.score.senderscore.com] 0.0 TVD_RCVD_IP Message was received from an IP address 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 70131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/bootloaders.scm (u-boot-sandbox): Wrap at 72 columns. Change-Id: I440c05b369c0be1437a3174e055efeeda8e5fe01 --- gnu/packages/bootloaders.scm | 55 ++++++++++++++++++ 1 file changed, 28 insertions(+), 27 deletions(-) Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in sa-accredit.habeas.com] 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in bl.score.senderscore.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/bootloaders.scm (u-boot-sandbox): Wrap at 72 columns. Change-Id: I440c05b369c0be1437a3174e055efeeda8e5fe01 --- gnu/packages/bootloaders.scm | 55 ++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index ca189fca3a..521e0d5bcd 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1316,34 +1316,35 @@ (define-public u-boot-qemu-riscv64-smode (make-u-boot-package "qemu-riscv64_smode" "riscv64-linux-gnu")) (define-public u-boot-sandbox - (let ((base (make-u-boot-package - "sandbox" #f ;build for the native system - ;; These disabled features require OpenSSL, which is - ;; incompatible with the GPLv2-only parts of U-boot. - #:configs (map (cut string-append "# CONFIG_" <> " is not set") - '("FIT_CIPHER")) - #:append-description - "The sandbox configuration of U-Boot provides a -@command{u-boot} command that runs as a normal user space application. It can -be used to test the functionality of U-Boot interactively without having to -deploy to an actual target device. @xref{Sandbox<6>,,,u-boot, The U-Boot + (define base + (make-u-boot-package + "sandbox" #f ;build for the native system + ;; These disabled features require OpenSSL, which is + ;; incompatible with the GPLv2-only parts of U-boot. + #:configs (map (cut string-append "# CONFIG_" <> " is not set") + '("FIT_CIPHER")) + #:append-description + "The sandbox configuration of U-Boot provides a @command{u-boot} +command that runs as a normal user space application. It can be used to +test the functionality of U-Boot interactively without having to deploy +to an actual target device. @xref{Sandbox<6>,,,u-boot, The U-Boot Documentation} for more information (for example by running @samp{info -\"(u-boot) Sandbox<6>\"})."))) - (package - (inherit base) - (arguments - (substitute-keyword-arguments (package-arguments base) - ((#:phases phases '%standard-phases) - #~(modify-phases #$phases - (add-after 'install 'symlink-u-boot-command - (lambda* (#:key outputs #:allow-other-keys) - ;; For ease of discovery. - (mkdir (string-append #$output "/bin")) - (symlink (search-input-file outputs "libexec/u-boot") - (string-append #$output "/bin/u-boot")))))))) - ;; cert-to-efi-sig-list from efitools creates the EFI capsule ESL. - (inputs (modify-inputs (package-inputs base) - (append efitools sdl2)))))) +\"(u-boot) Sandbox<6>\"}).")) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (add-after 'install 'symlink-u-boot-command + (lambda* (#:key outputs #:allow-other-keys) + ;; For ease of discovery. + (mkdir (string-append #$output "/bin")) + (symlink (search-input-file outputs "libexec/u-boot") + (string-append #$output "/bin/u-boot")))))))) + ;; cert-to-efi-sig-list from efitools creates the EFI capsule ESL. + (inputs (modify-inputs (package-inputs base) + (append efitools sdl2))))) (define-public u-boot-sifive-unleashed (let ((base (make-u-boot-package "sifive_unleashed" "riscv64-linux-gnu"))) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 15 03:47:20 2024 Received: (at 70131) by debbugs.gnu.org; 15 Dec 2024 08:47:20 +0000 Received: from localhost ([127.0.0.1]:49527 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMkHW-0000ra-Qq for submit@debbugs.gnu.org; Sun, 15 Dec 2024 03:47:19 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:52114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMkHS-0000rI-Hw for 70131@debbugs.gnu.org; Sun, 15 Dec 2024 03:47:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1734252398; bh=e0Uz97mp82GQIFpVFG1EItiP2P7ZQY5hD3mH15eRnSI=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=aJiNEUC0cae2CWQnCRMhZ74pFQ1aiN+qJDLwKzAX8ATtKcSY8CxQGPd0AKmOWK8++ Za1LhfNue68MTE9TrV0/FPYpqY9XTo59OlW3RIwyIs8+SDBJIPK2v0BNQ2iovCL2kf hEul/KwXtr94FjGv3YseI34ZUs7Eyr4OoCINeVLQ+yYHKc8Fw+COY276mvrytU+Rjg /GRLrAcK2OFrdGK9GiDRQFBevodwBtukFZqz+xq1b0rh/9GuXeYJix2WsnYla6L/6/ e1CLYgrbLRbDn5viaXbeS866Kk0wp9c+oRPlVCHVfYTGNvPnoN5kuarYktk2x5dz2T mUnHTOqJpa7pw== Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) by cascadia.aikidev.net (Postfix) with ESMTPSA id 80108510B; Sun, 15 Dec 2024 00:46:38 -0800 (PST) From: Vagrant Cascadian To: Herman Rimm , 70131@debbugs.gnu.org Subject: Re: [bug#70131] [PATCH v3 6/6] gnu: u-boot: Use guix-name. In-Reply-To: References: Date: Sun, 15 Dec 2024 00:46:31 -0800 Message-ID: <874j35bafs.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70131 Cc: Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2024-12-13, Herman Rimm wrote: > * gnu/packages/bootloaders.scm (u-boot): Use guix-name. Triggers build failure: error: guix-name: unbound variable hint: Did you forget a `use-modules' form? error: googletest: unbound variable hint: Did you forget a `use-modules' form? ... In unknown file: 10 (force #) In gnu/packages.scm: 243:33 9 (fold-packages # =E2=80=A6) In guix/discovery.scm: 158:11 8 (all-modules _ #:warn _) In srfi/srfi-1.scm: 460:18 7 (fold # =E2=80=A6) In guix/discovery.scm: 148:19 6 (_ _ ()) 115:5 5 (scheme-modules _ _ #:warn _) In srfi/srfi-1.scm: 691:23 4 (filter-map #= . #) In guix/discovery.scm: 123:24 3 (_ . _) In guix/ui.scm: 363:2 2 (report-unbound-variable-error _ #:frame _) In ice-9/boot-9.scm: 1685:16 1 (raise-exception _ #:continuable? _) 1685:16 0 (raise-exception _ #:continuable? _) ice-9/boot-9.scm:1685:16: In procedure raise-exception: Throw to key `match-error' with args `("match" "no matching pattern" (unbound-variable "resolve-interface" "no binding `~A' in module ~A" (shared-mime-info (gnu packages freedesktop)) #f))'. > > Change-Id: I7226519a676ba201be3a95078112b6514a201731 > --- > gnu/packages/bootloaders.scm | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm > index 521e0d5bcd..a0deecbfb5 100644 > --- a/gnu/packages/bootloaders.scm > +++ b/gnu/packages/bootloaders.scm > @@ -1038,9 +1038,7 @@ (define*-public (make-u-boot-package board triplet > (gnu-triplet->nix-system triplet)= ))))) > (package > (inherit u-boot) > - (name (string-append "u-boot-" > - (string-replace-substring (string-downcase bo= ard) > - "_" "-") > + (name (string-append (guix-name "u-boot-" board) > (or name-suffix ""))) > (description (if append-description > (string-append (package-description u-boot) > --=20 > 2.45.2 live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZ16XaAAKCRDcUY/If5cW ql9tAP9koZ5pgcaYJacaF+ORizegQJ/ANNaDKm809bdjZAzM2QD/aQGrey/222Eh jTsVBvckEMaPnRjHiMVoE7yN06Xm9AE= =Osot -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 15 04:21:40 2024 Received: (at 70131) by debbugs.gnu.org; 15 Dec 2024 09:21:40 +0000 Received: from localhost ([127.0.0.1]:49566 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMkom-0002SE-6f for submit@debbugs.gnu.org; Sun, 15 Dec 2024 04:21:40 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:42372) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMkoi-0002Ru-8k for 70131@debbugs.gnu.org; Sun, 15 Dec 2024 04:21:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1734254460; bh=IrJHxioYrUOJsr0vmyIqy2vW2INGIDN5QojQzJMHcos=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=VOPDNfnuKWPuGkIU02oBVL3ukw7CtNRDxY7GoQ8anNJcoc7RyXm150kmBUURmrhE3 XmpRZ2D20XntuEjeMPDbq1aIvvFYdqOmnHHT+qP7dJTTiudy+Zx++NRj2Qdd1k3rF5 +oRPTTVZgfSxplDllFJJwBXY/CwI+UnO64GpcoLAphemQjVkBpd7iJh2RjrgUANY2W kdhIOeffShP3tX92Ob/oyI9yqifmkLdvGqRJqqnlIRVMcCTkNjJO7YQLBKS7nDHVN8 KvXlYvZ1QT0NM2sFtJyeyAZbv1k7PXn0cnyIvwX/cskUUoIsvyUfmCaFihxkDS+QVP 7B3LSZM/44ULA== Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) by cascadia.aikidev.net (Postfix) with ESMTPSA id EB1575110; Sun, 15 Dec 2024 01:20:59 -0800 (PST) From: Vagrant Cascadian To: Herman Rimm , 70131@debbugs.gnu.org Subject: Re: [bug#70131] [PATCH v3 0/6] Update U-Boot. In-Reply-To: References: Date: Sun, 15 Dec 2024 01:20:53 -0800 Message-ID: <87seqp9ua2.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70131 Cc: Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain On 2024-12-13, Herman Rimm wrote: > The first and second patch should be applied together. The second patch > updates U-Boot to v2024.10, and the patches for u-boot-rockpro64-rk3399 > and u-boot-sandbox are updated and squashed into it. I successfully build-tested a few of these (with the guix-name patch reverted): /gnu/store/pqsbkssz6x8mfrxkhnf07xhczkk9s3bl-u-boot-rock64-rk3328-2024.10 /gnu/store/s6vwgw88s5cx01nwrwmx31pn8x6g0d6i-u-boot-rockpro64-rk3399-2024.10 /gnu/store/z4ziy84n4fk8pqyqddyhxxa2ssdn1fb1-u-boot-rpi-arm64-2024.10 This is obviously not comprehensive... as there are quite a few variants. I might be able to actually test the above targets actually produce a working u-boot and even have some old guix installs on some of them that I might be able to update to actually boot test them all the way. Might even be able to build test and boot test a few more as well, but for now, let's start with those... > I turned the ARM Trusted Firmware patch into #74849. The last patch of > this series requires [PATCH 3/6] of #74849. I tested without that patch applied, as there were issues getting arm-trusted-firmware variants to build. live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZ16fdgAKCRDcUY/If5cW qgQ6AP9JtWrsCfPJW6dtTVDNGWzRRO++9qDBPaBYwpOB7VHozwEA7Byaypl8BR4R 8JNyt0ubXOgcfMOXBEHNXO0uDo/yfg8= =MH53 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 17 17:05:08 2024 Received: (at 70131) by debbugs.gnu.org; 17 Dec 2024 22:05:08 +0000 Received: from localhost ([127.0.0.1]:60612 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNfgh-0000Eu-Eo for submit@debbugs.gnu.org; Tue, 17 Dec 2024 17:05:07 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:39148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNfgZ-0000Dz-9b for 70131@debbugs.gnu.org; Tue, 17 Dec 2024 17:05:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1734473063; bh=7ZiN07KLnLdBNbQKkPAQFjLdlq5Eri/HpnYf/hf8cG4=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=bXO5xfSbd3a6LmKNza0Yp7vB4AEha4TGM1zP48A7cMKV3R53YVyd3rL9+UdPMszXr /1MsXtffVibM4/TbnKwAQ3wCqite0ldGa2VnAjZjV7Fbn00FwfhNAAFVWZxeStibL/ FC03Qsic8yPWykz6vkxoyYmUbL/sR+5LpKd/PIgsRKsttfEdYO16QmmnDcpdJj28yR YX8pBe7WjQWNiccVI+6pOjYjOZrHTo8F3gkb7ogO7rtfVa0qk0Zus6DHfytIBoEvRi LgfIpXbWI4quMKltNC1yEWI+geyJ/3244O342bOeQ25F3R0R7RUHVOTgVdsNt9gweQ WtSV9I2d7+fPA== Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) by cascadia.aikidev.net (Postfix) with ESMTPSA id 068194B8A; Tue, 17 Dec 2024 14:04:23 -0800 (PST) From: Vagrant Cascadian To: Herman Rimm , 70131@debbugs.gnu.org Subject: Re: [bug#70131] [PATCH v3 0/6] Update U-Boot. In-Reply-To: <87seqp9ua2.fsf@contorta> References: <87seqp9ua2.fsf@contorta> Date: Tue, 17 Dec 2024 14:04:16 -0800 Message-ID: <87jzbyezkv.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70131 Cc: vagrant@debian.org, Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain On 2024-12-15, Vagrant Cascadian wrote: > On 2024-12-13, Herman Rimm wrote: >> The first and second patch should be applied together. The second patch >> updates U-Boot to v2024.10, and the patches for u-boot-rockpro64-rk3399 >> and u-boot-sandbox are updated and squashed into it. > > I successfully build-tested a few of these (with the guix-name patch > reverted): > > /gnu/store/pqsbkssz6x8mfrxkhnf07xhczkk9s3bl-u-boot-rock64-rk3328-2024.10 > /gnu/store/s6vwgw88s5cx01nwrwmx31pn8x6g0d6i-u-boot-rockpro64-rk3399-2024.10 > /gnu/store/z4ziy84n4fk8pqyqddyhxxa2ssdn1fb1-u-boot-rpi-arm64-2024.10 > > This is obviously not comprehensive... as there are quite a few > variants. I have built-tested all the u-boot-* except u-boot-sandbox and u-boot-documentation. There are huge toolchains not built for aarch64 at the moment (e.g. all of rust) that need to be rebuilt to properly test all of those. Similarly, I did not test the dependents of u-boot-tools, although u-boot-tools itself builds fine. I might be able to at least test those on x86_64 when I get a chance to boot an x86_64 machine. > I might be able to actually test the above targets actually produce a > working u-boot and even have some old guix installs on some of them > that I might be able to update to actually boot test them all the way. > > Might even be able to build test and boot test a few more as well, but > for now, let's start with those... I just did some basic boot testing of u-boot-pinebook and u-boot-rock64-rk3328, by manually installing and booting Debian with it, though I have not tested with Guix System (and not sure I will be able to). I might be able to test u-boot-sifive-unmatched next. Having troubles unrelated to these patches with the rockpro64 board, but hope to get those fixed. Have a number of the armhf boards too, though not sure I actually have an OS installed on any of them to make testing quick and easy enough to bother. But with a few more boot tests, and testing that u-boot-tools dependents still build and u-boot-sandbox and u-boot-documentation builds, I think I would be comfortable merging this patch series soon (without the guix-name patch). live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZ2H1YAAKCRDcUY/If5cW qmvnAP91ujPpQVSyGR2bss+N73Ue+rtfZhJhsrCGHcUKkxk/IAEA77E9Xp1yKZYS ymHQiB5Oe34XpKxDwFkhvvBzAJ527wA= =rpL+ -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 17 17:39:57 2024 Received: (at 70131) by debbugs.gnu.org; 17 Dec 2024 22:39:57 +0000 Received: from localhost ([127.0.0.1]:60660 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNgEP-0001tv-6E for submit@debbugs.gnu.org; Tue, 17 Dec 2024 17:39:57 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:60774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNgEL-0001tf-NX for 70131@debbugs.gnu.org; Tue, 17 Dec 2024 17:39:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1734475185; bh=zMFLWJ+26N1ShigjzE744FjhbmCEk7wKeO8scDg8K/4=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=ONWtwAshsrGsnjrYu+oMVmaW8FmjeXUMLCUZLuzIEddw9F7iYRgXSQ2FhNAbOMsGF b0/v07x48KD9gAEF7w9GQq74Vi8DhlHzGZEpFyXaZckRP36P5ffFG5Xtb5hF/2Ofi4 R/mvhuHP3xqofqb8UTorD0zG6kOln7UJNhgplCut1VLYKOxSoB6QUvrIFuFSERv8C3 Lvt0DHKkmqfL25gELvn4CJH9+Ut/nRPtDuRGU/IBPY6za2T1talU22FgQfSQu5pTWN 8UWY/zQ2Ty+dNfe3ShKhm7+U7FIqOEaPlTJJLiIiUDr0U7vE4UKh2mX+FetxN8P8Pz WsvnYYrc2qa6Q== Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) by cascadia.aikidev.net (Postfix) with ESMTPSA id 0C7074B8A; Tue, 17 Dec 2024 14:39:45 -0800 (PST) From: Vagrant Cascadian To: Herman Rimm , 70131@debbugs.gnu.org Subject: Re: [bug#70131] [PATCH v3 0/6] Update U-Boot. In-Reply-To: <87jzbyezkv.fsf@contorta> References: <87seqp9ua2.fsf@contorta> <87jzbyezkv.fsf@contorta> Date: Tue, 17 Dec 2024 14:39:38 -0800 Message-ID: <87h672exxx.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70131 Cc: vagrant@debian.org, Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain On 2024-12-17, Vagrant Cascadian wrote: > I just did some basic boot testing of u-boot-pinebook and > u-boot-rock64-rk3328, by manually installing and booting Debian with it, > though I have not tested with Guix System (and not sure I will be able > to). > > I might be able to test u-boot-sifive-unmatched next. Having troubles > unrelated to these patches with the rockpro64 board, but hope to get > those fixed. Boot tested u-boot-rockpro64-rk3399 booting Debian. So that is three targets not fundamentally broken, at least. :) live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZ2H9qgAKCRDcUY/If5cW qu3uAP9r9ZSu1Rvrmf9d36yb9I54NZbBGtG76Qb/9ZM0r4wOXQEA+I0CyNy4ko8F P2ylXHIzFjYfRCPIx/VJ9+zTfbTzVg8= =1yaT -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 17 19:05:36 2024 Received: (at 70131) by debbugs.gnu.org; 18 Dec 2024 00:05:36 +0000 Received: from localhost ([127.0.0.1]:60780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNhZI-00065k-AJ for submit@debbugs.gnu.org; Tue, 17 Dec 2024 19:05:36 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:50336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNhZB-00063Z-4n for 70131@debbugs.gnu.org; Tue, 17 Dec 2024 19:05:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1734480291; bh=3xtCcMIDFZd+TJ3f2zKtMnomy3gER/7f6xseb/jvmBY=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=E2/lEZeHhRpEDEot4B7nja25OYJB+48EjEola0YTE5gf251oAvoOKQqIdemryTQ61 LhCNUKbiQBYTEMFOYfCQv2tJKJqU+K9E+gx5NnyMb0r/gokKMd+01t/w9S7RYwxnGW vsQCPqVPKBowMIMTs9Clas9YuWKJDwzOZqqbKbTLjeKC7rdZzjN0Hdn243wjFaznFy KU1MWmvD7uVLg0j9w7mnl5g8ENndOBSvAZEzMsNgiyWwU+TnUZeif7iuilsLYhRsOg gwQ8/59+YKXKjjgXiJLdVD4/8JS0LkyU0NJLwUdrRof+y/9NJJKmaoKqw9UBtniWNH KfS3UWskhw2Vw== Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) by cascadia.aikidev.net (Postfix) with ESMTPSA id 6E3AB4B8A; Tue, 17 Dec 2024 16:04:51 -0800 (PST) From: Vagrant Cascadian To: Herman Rimm , 70131@debbugs.gnu.org Subject: Re: [bug#70131] [PATCH v3 0/6] Update U-Boot. In-Reply-To: <87h672exxx.fsf@contorta> References: <87seqp9ua2.fsf@contorta> <87jzbyezkv.fsf@contorta> <87h672exxx.fsf@contorta> Date: Tue, 17 Dec 2024 16:04:44 -0800 Message-ID: <87ed25g8kj.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70131 Cc: vagrant@debian.org, Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain On 2024-12-17, Vagrant Cascadian wrote: > On 2024-12-17, Vagrant Cascadian wrote: >> I just did some basic boot testing of u-boot-pinebook and >> u-boot-rock64-rk3328, by manually installing and booting Debian with it, >> though I have not tested with Guix System (and not sure I will be able >> to). >> >> I might be able to test u-boot-sifive-unmatched next. Having troubles >> unrelated to these patches with the rockpro64 board, but hope to get >> those fixed. > > Boot tested u-boot-rockpro64-rk3399 booting Debian. So that is three > targets not fundamentally broken, at least. :) And also boot tested u-boot-sifive-unmatched, which had a glitch in how it changed the boot device order and booted an old kernel from a device that the previous defaults did not boot... so that is a bit odd... worked around it by renaming the extlinux.conf file so that it would not select it. Other platforms that switched from u-boot's distro boot to u-boot's bootstd might have similar issues, so it is something to note possibly in a news entry. This might be worth setting BOOTSTD_FULL=y in the configuration; without it there is no way to select the boot device if the first one it picks is not the one you actually want... and possibly trying to get that upstream too. live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZ2IRnQAKCRDcUY/If5cW qpe/AP976PwgUVe+GhoPGZxkdxZ4TQQJIr63tL8B4eG9h74MqgD9GKzW71J/HItb K0me77leGOhbLtXyloIsjK1RaL+4SAI= =L5Ge -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 18 18:26:36 2024 Received: (at 70131-done) by debbugs.gnu.org; 18 Dec 2024 23:26:36 +0000 Received: from localhost ([127.0.0.1]:36432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tO3R6-0007kH-1Z for submit@debbugs.gnu.org; Wed, 18 Dec 2024 18:26:36 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:43332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tO3R3-0007k0-Rq for 70131-done@debbugs.gnu.org; Wed, 18 Dec 2024 18:26:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1734564356; bh=o/kPHOykn21aDQ/tg2pjVFkOAs/IiKmqO7V9JEHyM4M=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=RmLSbh+zbRVKVFIZ5uCbTMKUJklI35dRX1AoJYRQYqKS/Skp9qSVFwafuWZpxJPaJ zeEddlXD7Ge3yX/63aq1N17OSTAVHLoFCADmbdyi292nYH2XFISHP0/5xooSL+0CL8 l/5wwb3i+2kS21Su3VHWU8C7F7XEvqr+qxAzsefVHryjCoCN/dkxwOrQx6e/o1MmMy XfNCceY4XUfJA56TpPTzunjrdOr801mk/CLN64rX4ZgGkfFUPQxsgXrhcCj8BNGgmF gJSl1dchv6/s1YVzGPwap6whUm+dKmZ/VVb4UOWMjoVpeSsnBWH1l6Uv+NREnYr6vn BpoZ02Gb0ytUw== Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) by cascadia.aikidev.net (Postfix) with ESMTPSA id EE4462825; Wed, 18 Dec 2024 15:25:55 -0800 (PST) From: Vagrant Cascadian To: Herman Rimm , 70131-done@debbugs.gnu.org Subject: Re: [bug#70131] [PATCH v3 0/6] Update U-Boot. In-Reply-To: References: Date: Wed, 18 Dec 2024 15:25:48 -0800 Message-ID: <87ed248tfn.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70131-done Cc: Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain On 2024-12-13, Herman Rimm wrote: > Herman Rimm (6): > Revert "gnu: u-boot-tools: Fix segfault while running tests." > gnu: u-boot: Update to 2024.10. > gnu: u-boot-tools: Remove extraneous native-input. > gnu: u-boot: Use search-patches. > gnu: bootloaders: u-boot-sandbox: Reformat. Thanks for your work on all this! After testing that everything at least builds on x86_64-linux, and most of the targets built on aarch64-linux, and some boot testing of a few targets, these were pushed as: 1a62f687e504c67f26693f3bc60a90e503ab4ea9 gnu: bootloaders: u-boot-sandbox: Reformat. 56c6466887a3fdca0bc407418f807448a58e35d2 gnu: u-boot: Use search-patches. 9e858182581fa17f6248bbbcb9d8742320a42217 gnu: u-boot-tools: Remove extraneous native-input. ef50749aed807de28458b38b35e941a414637459 gnu: u-boot: Update to 2024.10. 8a016fa0562e7f23b32a3fa25542b19af64b9c0e Revert "gnu: u-boot-tools: Fix segfault while running tests." > gnu: u-boot: Use guix-name. I left out the guix-name patch as it failed to build. With that update out of the way, hopefully it will make the other changes a little easier to finish up! live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZ2NZ/QAKCRDcUY/If5cW qmCYAP0ZN8y+QQYrtocVWZIP+XTnbBYufuc8VJKb+NlAu+hZBAD+NMmpp2pilGOp XPEiDD7B69BBIsk1MtB2ahmpEk1XOgQ= =OhzU -----END PGP SIGNATURE----- --=-=-=-- From unknown Fri Jun 20 07:19:34 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 16 Jan 2025 12:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator