From patchwork Mon Aug 26 14:45:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 30339 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4696227BBEA; Mon, 26 Aug 2024 15:47:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EC23527BBE2 for ; Mon, 26 Aug 2024 15:47:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1siazw-0004e3-U3; Mon, 26 Aug 2024 10:47:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1siazw-0004dN-3h for guix-patches@gnu.org; Mon, 26 Aug 2024 10:47:12 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1siazv-0005so-PU for guix-patches@gnu.org; Mon, 26 Aug 2024 10:47:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=oeWbLrxSKWrXU7HvcaLf4nhs7oJmGaKdHADj8tfjVho=; b=XVIiPwKq4of5VmobPF0uDWeFa9oYBE/upSqg0Tx94W9By+wtbtI12fZbBI6tKxKzEHMrF++u9Oy60aIhiyjwa3T1g9iaJ4Op9K2VjHah1YsVyIhNAJ75Lkf9KVI40CQLyUcgv77o7ZFMKeVcOsPKNl7j6DmEYfHO6iJEYdDLNtjMjoVJzmYOtvbS78qbGJEbkI867I+C+DD5Kti9L4jU/ABtpKMwTEa1cVJClDKTa9XXx+YSE2hMBCNVKhMvyMm3xffacRAy/iEnhOD5TYd6ZvYe6gKsAQ2o404Pfk7lnzWGHa2yhUXC2rkgPceCmiZqod5i++zwysxQUKdyOJfxjw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sib0k-0008Au-3X for guix-patches@gnu.org; Mon, 26 Aug 2024 10:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70131] [PATCH v2 1/8] gnu: bootloader: Add nanopi-r4s-rk3399 bootloader. References: In-Reply-To: Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Aug 2024 14:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70131 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70131@debbugs.gnu.org Received: via spool by 70131-submit@debbugs.gnu.org id=B70131.172468362231240 (code B ref 70131); Mon, 26 Aug 2024 14:48:02 +0000 Received: (at 70131) by debbugs.gnu.org; 26 Aug 2024 14:47:02 +0000 Received: from localhost ([127.0.0.1]:45037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siazk-00087T-Rb for submit@debbugs.gnu.org; Mon, 26 Aug 2024 10:47:02 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:58375 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siazg-000871-5K for 70131@debbugs.gnu.org; Mon, 26 Aug 2024 10:47:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1724683556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oeWbLrxSKWrXU7HvcaLf4nhs7oJmGaKdHADj8tfjVho=; b=aAQTLkn9bnd2I+t8VEg8qjVAG5tgLwI5n0LI6Ke7pGQo6zJgGedDjYSuGp4+ai9j/Ed2gj /YouC3Lspb/fSRTZOYPlgYxoOfHsvNzVKbz8s+Q+B2LzMRSyBHn6YCCQO0+bi7HLOQMbiG FjI9dp3RZZUHcdcB+p4+u26EGbIGtEn91cnbL8XXPiwSAT7QG6hRc03jsiwZLgbTK7gtAJ uNoBkgUxQvkhxHluBDoJW3vecSZ3AEJJ2VR7j9ew38tSCHCa9qk/UpR3fL3Ovew2YPvHBB TiLvOfqT3/ajTm9ew3dOJ39IJ6k4vKgtkKu/8D25sqKOtbhWdZv5MSPaIiU72Q== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 0251b425 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Mon, 26 Aug 2024 14:45:56 +0000 (UTC) Date: Mon, 26 Aug 2024 16:45:00 +0200 Message-ID: <20240826144511.3770-1-herman@rimm.ee> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/bootloader/u-boot.scm (install-nanopi-r4s-rk3399-u-boot, u-boot-nanopi-r4s-rk3399-bootloader): Add variable. * gnu/packages/bootloaders.scm (u-boot-nanopi-r4s-rk3399): Add variable. Change-Id: I6d4cb098727fe4027aea33a39c59d34000dfc4db --- gnu/bootloader/u-boot.scm | 18 +++++++++++++++++- gnu/packages/bootloaders.scm | 17 ++++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index c5437a7b63..7888a4e030 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2023 Efraim Flashner -;;; Copyright © 2023 Herman Rimm +;;; Copyright © 2023-2024 Herman Rimm ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. @@ -37,6 +37,7 @@ (define-module (gnu bootloader u-boot) u-boot-cubietruck-bootloader u-boot-firefly-rk3399-bootloader u-boot-mx6cuboxi-bootloader + u-boot-nanopi-r4s-rk3399-bootloader u-boot-nintendo-nes-classic-edition-bootloader u-boot-novena-bootloader u-boot-orangepi-r1-plus-lts-rk3328-bootloader @@ -98,6 +99,15 @@ (define install-imx-u-boot (write-file-on-device u-boot (stat:size (stat u-boot)) image (* 69 1024))))) +(define install-nanopi-r4s-rk3399-u-boot + #~(lambda (bootloader root-index image) + (let ((spl (string-append bootloader "/libexec/idbloader.img")) + (u-boot (string-append bootloader "/libexec/u-boot.itb"))) + (write-file-on-device spl (stat:size (stat spl)) + image (* 64 512)) + (write-file-on-device u-boot (stat:size (stat u-boot)) + image (* 16384 512))))) + (define install-orangepi-r1-plus-lts-rk3328-u-boot #~(lambda (bootloader root-index image) (let ((idb (string-append bootloader "/libexec/idbloader.img")) @@ -274,6 +284,12 @@ (define u-boot-novena-bootloader (inherit u-boot-imx-bootloader) (package u-boot-novena))) +(define u-boot-nanopi-r4s-rk3399-bootloader + (bootloader + (inherit u-boot-bootloader) + (package u-boot-nanopi-r4s-rk3399) + (disk-image-installer install-nanopi-r4s-rk3399-u-boot))) + (define u-boot-orangepi-r1-plus-lts-rk3328-bootloader (bootloader (inherit u-boot-bootloader) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 4072df50d7..f42d42c1c4 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2022, 2023 Denis 'GNUtoo' Carikli ;;; Copyright © 2021 Stefan ;;; Copyright © 2022, 2023 Maxim Cournoyer -;;; Copyright © 2023 Herman Rimm +;;; Copyright © 2023-2024 Herman Rimm ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. @@ -1237,6 +1237,21 @@ (define-public u-boot-novena version, contrary to Novena upstream, does not load u-boot.img from the first partition.")) +(define-public u-boot-nanopi-r4s-rk3399 + (let ((base (make-u-boot-package "nanopi-r4s-rk3399" "aarch64-linux-gnu"))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "BL31" (search-input-file inputs "/bl31.elf")))))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-rk3399)))))) + (define-public u-boot-orangepi-r1-plus-lts-rk3328 (let ((base (make-u-boot-package "orangepi-r1-plus-lts-rk3328" "aarch64-linux-gnu"))) (package From patchwork Mon Aug 26 14:45:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 30343 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C3FD427BBED; Mon, 26 Aug 2024 15:48:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1B2EE27BBE2 for ; Mon, 26 Aug 2024 15:48:02 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1siazx-0004ei-O1; Mon, 26 Aug 2024 10:47:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1siazw-0004dO-5S for guix-patches@gnu.org; Mon, 26 Aug 2024 10:47:12 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1siazv-0005sq-RX for guix-patches@gnu.org; Mon, 26 Aug 2024 10:47:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=hOwE/rQcu+h0Smx9elWmH0EyYZjUMnF2XQF63Pv+ZBg=; b=tLENbRTVUuKHHMmlB73A5Zh6v4rC36ET1S+kR++Cpl5xSzL1RqLjRLxUuR34DuNPbkyOCe701bx12ESIVAROPd7H+aNhzxRA/zQLeqwznvmqtPbJaR6szaPtGGxI5uCbZO29aXPLFxQ6eFWIP9TOMUAYugQVZpLOyh6n1/16QW2pPBDXOqWj1VM3PdS5A6mg2mimk7RSn9n93UIzss80RPD33I9UAW/rGSunG62D7DjjNuzFDGCyhgnzAZjwGBzAZRX72//R9ElSsqI+eGyep02F5J2qKOim65pdBoiTcNro3xtbKn1AMdlut8eaXAAJLkHpa/U2sy/+UTmgj9IlhA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sib0k-0008B8-Ut for guix-patches@gnu.org; Mon, 26 Aug 2024 10:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70131] [PATCH v2 2/8] gnu: u-boot: Use DDR3 patch for Nano Pi R4S. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Aug 2024 14:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70131 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70131@debbugs.gnu.org Received: via spool by 70131-submit@debbugs.gnu.org id=B70131.172468362931313 (code B ref 70131); Mon, 26 Aug 2024 14:48:02 +0000 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) 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootloaders.scm (%u-boot-nanopi-r4s-ddr3-patch): Add variable. (u-boot)[source]: Use patch. * gnu/packages/patches/u-boot-nanopi-r4s-ddr3.patch: Add file. * gnu/local.mk (dist_patch_DATA): Register patch. Change-Id: Ibbf952f2806c9cac7fc29e1264d427bf6ee67d01 --- gnu/local.mk | 3 +- gnu/packages/bootloaders.scm | 7 +++- .../patches/u-boot-nanopi-r4s-ddr3.patch | 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 From patchwork Mon Aug 26 14:45:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 30340 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3415927BBE2; Mon, 26 Aug 2024 15:47:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8D88D27BBE2 for ; Mon, 26 Aug 2024 15:47:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1siazw-0004e2-UO; Mon, 26 Aug 2024 10:47:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1siazw-0004dK-0r for guix-patches@gnu.org; Mon, 26 Aug 2024 10:47:12 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1siazv-0005sp-Mu for guix-patches@gnu.org; Mon, 26 Aug 2024 10:47:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=nUf/JrJVT27pCFqUqWC3hvOqTE6h1rG/ZaHwPqb1Ay8=; b=IgkDuWVANKrta4koHCpD3HPQb/nZOb8yzbbixyKufqU/X1WNPg3Mb1AaUeVjpwe0RUX9WmhxZuPUI2yCiwKz8r2aGmvl+pffm47zHq2yzR5ZpR6pZRuVyiE1aV4BKEgfUVYbNtUZ/03uqOKgHJgbGQH1o7HgtLLGLGd5RWgjZ7MsPuhps18yyq8S8A5qQPyA9kejq2g5PNnaHQNOxTBpao+tFFEq9rFtV9KW+OA/+qczpaJPYRsbjDAdE1rQiLLZ16iYZBtCZgCr9nvOTU0+Aoet00OnPb4HbvaI8bziGSOibFgkgYgKfntJs6VFJ/QNSF+nGcW6QtcsxcovRbcCKw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sib0k-0008B1-Fq for guix-patches@gnu.org; Mon, 26 Aug 2024 10:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70131] [PATCH v2 3/8] gnu: firmware: Update make-arm-trusted-firmware to 2.10. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Aug 2024 14:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70131 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70131@debbugs.gnu.org Received: via spool by 70131-submit@debbugs.gnu.org id=B70131.172468362531275 (code B ref 70131); Mon, 26 Aug 2024 14:48:02 +0000 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) 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/firmware.scm(make-arm-trusted-firmware): Update to 2.10. --- gnu/packages/firmware.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 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)) From patchwork Mon Aug 26 14:45:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 30345 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8EB9D27BBEA; Mon, 26 Aug 2024 15:48:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DCA0A27BBE2 for ; Mon, 26 Aug 2024 15:48:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sib02-0004gB-7k; Mon, 26 Aug 2024 10:47:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1siazw-0004de-Cz for guix-patches@gnu.org; Mon, 26 Aug 2024 10:47:12 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1siazw-0005t2-35 for guix-patches@gnu.org; Mon, 26 Aug 2024 10:47:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ubk37vZLf5GWn5dkhd9ncUKQ4K9f5CVSEpr5KvCuyXk=; b=AUbW+NqEMUF1zhMGroEMNTORKTmASmr67EUN3pRFS7NAKUAeTcSllfXffV7lEVdqT/PflpXbA1nOmOwkZBAH1xVYSozqhqHAuzudJ6+l7PLE4ohWeKjUTQWKa54ARYsqPzgztD9plh0VzxZClApowDZkBcbFjtN6dw4lh5Bzl7OvwRGODDNWzojyTpTF0Jti4L+dLszuVihbsCpkp3WxTkcB0MeKDOuWAEvySh1HAJKoFxGtZiSqcjMUTKoYfhsKf7Waq0tDt0Viwp1RYQhe+G/b1RbyEr3vd9MLQi8VXSsxqgcNSjGretOVksVieUf1521mTmUJC5ALOZ46JKOXcQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sib0l-0008BG-DT for guix-patches@gnu.org; Mon, 26 Aug 2024 10:48:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70131] [PATCH v2 4/8] gnu: u-boot: Update to 2024.07. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Aug 2024 14:48:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70131 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70131@debbugs.gnu.org Received: via spool by 70131-submit@debbugs.gnu.org id=B70131.172468363031321 (code B ref 70131); Mon, 26 Aug 2024 14:48:03 +0000 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) 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootloaders.scm (u-boot): Update to 2024.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 - From patchwork Mon Aug 26 14:45:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 30342 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8E8D727BBE9; Mon, 26 Aug 2024 15:48:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7BCF127BBEA for ; Mon, 26 Aug 2024 15:48:03 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1siazy-0004fK-7C; Mon, 26 Aug 2024 10:47:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1siazw-0004dz-Qm for guix-patches@gnu.org; Mon, 26 Aug 2024 10:47:12 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1siazw-0005tG-Hj for guix-patches@gnu.org; Mon, 26 Aug 2024 10:47:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=Sh7+VrGbIbDscZTvmQJYyqUPWvqsr4efnZdmJM3RJ6E=; b=Qsm1VfXBytrb+kwCl9riY8QQxY+FWJ35aGP1e6RK/Esl8XaqDUmhw3NDjwxwFN3gPjnrnRx11/3rA7TqI32EKPNaRrgZ4L756oEumnNiqKrzKAZ4YzzxS6qJHrfC37RYGvMzxQ7k49v39pL88bVA3tiwxI2ozKxKVBDnBQ81IEeKuh5VjcT0X7gLA+hs4VxEOJjMU0hr4GIgGDOP2xcPnuJN9M55eqM34VvcXSaaFs1hduXzlWu5PJJrN7Q0MrzUX5al1zPv6gt/55i4n0Gss+312Wo/RR44A84HqpY237DpabS9a9wUcV99L+sjJLOorMIHh1zifOvLVbR8RMVpTQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sib0l-0008BN-SL for guix-patches@gnu.org; Mon, 26 Aug 2024 10:48:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70131] [PATCH v2 5/8] gnu: python-u-boot-pylib: Fix pyproject.toml. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Aug 2024 14:48:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70131 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70131@debbugs.gnu.org Received: via spool by 70131-submit@debbugs.gnu.org id=B70131.172468363031328 (code B ref 70131); Mon, 26 Aug 2024 14:48:03 +0000 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) 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootloaders.scm (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? From patchwork Mon Aug 26 14:45:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 30344 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0C77E27BBEB; Mon, 26 Aug 2024 15:48:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A02A627BBEA for ; Mon, 26 Aug 2024 15:48:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1siazy-0004fL-7S; Mon, 26 Aug 2024 10:47:14 -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 1siazx-0004eQ-8W for guix-patches@gnu.org; Mon, 26 Aug 2024 10:47:13 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1siazw-0005tM-VN for guix-patches@gnu.org; Mon, 26 Aug 2024 10:47:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=gh75pz1Okhhr+6mD2es7C+RlFsLXXwWh+NjZZsGrxug=; b=XUwVNNE+7Q+FK/RPBBvyvxq4yI1qWKtyBooogBAIUXpXRVIrwMrON356L1smXmBnGJSXJFA6rU/ckdF9pLJWrpwVRLjbGjyTirgWEXjUSgVPx8n3lSylakxgUKqucWZvmDq9tybO9A4jEbH1xp6lpMKH060LQCelYE4/5rPrwlwjjLAvl3t7ZyB+Wv455a1gWLmy5SNwxLlDKQiAPaChI+a8fAGj7ipNPYHIq1T7V8l7ReYZ+j5SQSfZvalOR66vvLI2UTlZojoXgPw6RKF158HmI0FshJLJIXL7A8IAs2bKetVMufQWny96IzgxS8fobP7I0LUlcfKFcd8OS8unDg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sib0m-0008BV-A7 for guix-patches@gnu.org; Mon, 26 Aug 2024 10:48:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70131] [PATCH v2 6/8] gnu: u-boot-rockpro64-rk3399: Unconfigure CONFIG_DM_SCSI. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Aug 2024 14:48:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70131 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70131@debbugs.gnu.org Received: via spool by 70131-submit@debbugs.gnu.org id=B70131.172468363031335 (code B ref 70131); Mon, 26 Aug 2024 14:48:04 +0000 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) 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootloaders (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 From patchwork Mon Aug 26 14:45:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 30341 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 746C027BBEA; Mon, 26 Aug 2024 15:47:39 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CC6EC27BBE2 for ; Mon, 26 Aug 2024 15:47:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sib01-0004fy-LV; Mon, 26 Aug 2024 10:47:17 -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 1siazx-0004ee-LC for guix-patches@gnu.org; Mon, 26 Aug 2024 10:47:13 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1siazx-0005tS-BO for guix-patches@gnu.org; Mon, 26 Aug 2024 10:47:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=4yfAGrSc+YbZjnd8tIMnHkN4fFryrqkKWn/6CIJIsSM=; b=l4J3oPqjTQus9MMM5Y0ZgPzYpNq5rrPp/NPluO0H49HZknU6mU4+5E9zhxItOVWJFsHAf8geoq/iRqjn2NuwDDYyVPoHB6c9n2ILjp1I0bYryvyVSguvD/YewgQio8CibfEzDZRIh7rwZnxzQ8eDq6rHA5GRoNElAMeh3ucj/d8JUtnSqSZ7V7KcYTqSafS/FWq5/Lebys4MPj6EYhM/6pMqGzDvECnSe/W5ew5D7YIszNaE+sJvQp14Ti0vDfbLSNNDxsonhVFPi/UbftD6eQlQD7tDnXEA7Z+cmVBjahPbYyff+Wc9IUAdIIn4BfG51zj3nB+rmM4/kD/f4Q2EsQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sib0m-0008Bc-MC for guix-patches@gnu.org; Mon, 26 Aug 2024 10:48:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70131] [PATCH v2 7/8] gnu: u-boot-sandbox: Unconfigure CONFIG_RSA and CONFIG_TOOLS_LIBCRYPTO. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Aug 2024 14:48:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70131 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70131@debbugs.gnu.org Received: via spool by 70131-submit@debbugs.gnu.org id=B70131.172468363131343 (code B ref 70131); Mon, 26 Aug 2024 14:48:04 +0000 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) 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootloaders.scm (u-boot-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 From patchwork Mon Aug 26 14:45:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 30346 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8D62F27BBEA; Mon, 26 Aug 2024 15:48:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2DC6827BBE2 for ; Mon, 26 Aug 2024 15:48:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sib02-0004g9-0d; Mon, 26 Aug 2024 10:47:18 -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 1siazy-0004fF-4E for guix-patches@gnu.org; Mon, 26 Aug 2024 10:47:14 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1siazx-0005ta-QL for guix-patches@gnu.org; Mon, 26 Aug 2024 10:47:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=+U5JQq3Nyo4EVKT0dGN6QBE21ML/gkWPN/BIbine+N8=; b=M7K6dx+8ZoB26TXS1Q6eW7YVm4Qn3ABi8jW11txHLwXF6ebtncSE2CtzYO9hYSHKc0dZKWz3STu8BTcgkWlvrkbDZN64UuNEMJ+6Mfhj9fKfd7U/jBAYBPSO3KtTBL3dxmzWO5ekQkvmErwhdwdJjEJk92j6acGY1bGwUYS0zlig/EQIHpqwsJyeLwv+QER39NTa6Q25Ec5Gclm6uyoiOJaR6UdTev+V/RIoUWxFCNRbSzJZmbW2Wt3pizOqtYGMbjQySQDbf4F0a51tjCKWZzpLbI4zxbMWt8HJd2B4Mzdl5tbDSoTwzE4OwcCyhC4jXJIuUKJg0e43LostG19+hA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sib0n-0008Bj-4P for guix-patches@gnu.org; Mon, 26 Aug 2024 10:48:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70131] [PATCH v2 8/8] gnu: bootloader: Add orangepi-zero2w bootloader. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Aug 2024 14:48:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70131 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70131@debbugs.gnu.org Received: via spool by 70131-submit@debbugs.gnu.org id=B70131.172468363131350 (code B ref 70131); Mon, 26 Aug 2024 14:48:05 +0000 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) 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/bootloader/u-boot.scm (u-boot-orangepi-zero2w-bootloader): Add variable. * gnu/packages/bootloaders.scm (u-boot-orangepi-zero2w): Add variable. * gnu/packages/firmware.scm (arm-trusted-firmware-sun50i-h616): Add variable. Change-Id: Idb43fdabac51b3301f3bea24fec72bfa29636489 --- gnu/bootloader/u-boot.scm | 6 ++++++ gnu/packages/bootloaders.scm | 18 ++++++++++++++++++ gnu/packages/firmware.scm | 6 ++++++ 3 files changed, 30 insertions(+) diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index 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"))