From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id eAb6IkpQW2cYgAAAqHPOHw:P1 (envelope-from ) for ; Thu, 12 Dec 2024 21:06:18 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id eAb6IkpQW2cYgAAAqHPOHw (envelope-from ) for ; Thu, 12 Dec 2024 22:06:18 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=OA4ZlQqs; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=VOZjLIur; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734037578; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=+sMDLqsxe3IewEti51PKD1ULoF1TwcdbjnRstFfB/hg=; b=HoEc1w421JmoSqv1kr2M+EZO70K14+rZoN/xFbABG1N9mvyn2UFhZY9pgYQeIuGbCnHA9X V3IXgV8R7dow7PbI7BPiC5hBwe6x6SBv4QfW8G5fx5PjgDCv1oHKk9Yew6pCjDStNstpJ0 r1fYCYhDT5PEJBdP1mLQ6x3WdlcSHhnC3yCXY+gTXpu0iO9eyAP5R841Z8f8esWTAjoq62 iGE/yekK4ZVrIS3OnRaFrpwFVs48ESvR7N/Mg6nZRbFcThnQ0APH8mV+bzihmoXjCMR105 wZqDUJPQ7mkvGQDsBz9X2ydcK93O9Fzw/QorolH4xzmyNOmb8aLoYfoauC3AvA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=OA4ZlQqs; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=VOZjLIur; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734037578; a=rsa-sha256; cv=none; b=RJuw8/MVEyo3vY/hlHC9Kve/iCkViLQ1GPY0wyubr2eX08tnfRb4J7v8+8m+CzaweXgxM9 MQrRmAIXqgP7Awtxm7eTF9/TjuQBnp+FA8DM9/J6wblsUqcTW6SY5g4Bgh1aZtVbM/f+8M 69Lq0tpQ5VaGuQ3FJhbhlPme9dkIYyBwjpT2Q2ajrtskmR1LKcqimaINPEkUJ39d3ESChy X8DpureT/ozFft2+w4636HO7sL+a1iuBsyXMeX6Bi7Gq3eaggbdtQSueVj+S2ueHK4AQXg FMEHyzT8MkrEwUdLwFVqq016i1XSxlMFzLo+ZZ1kmcAYt/Ar0ZKu6b9dBM+GKA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5D6897D69E for ; Thu, 12 Dec 2024 22:06:18 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tLqNE-0004RY-7O; Thu, 12 Dec 2024 16:05:29 -0500 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 1tLqMs-0004Ml-NF for guix-patches@gnu.org; Thu, 12 Dec 2024 16:05:10 -0500 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 1tLqMs-0006fx-EU for guix-patches@gnu.org; Thu, 12 Dec 2024 16:05:06 -0500 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:Subject; bh=+sMDLqsxe3IewEti51PKD1ULoF1TwcdbjnRstFfB/hg=; b=OA4ZlQqseluySEnT0EAnwJTp2pl/XNMTQT3C1AdA2dBiwCBBOjRqloeS4NgUi7bUTq0j5w633mBwLW0uZ/7FeW8Y/0PttQYn2N2++J6lQ/ZCgmjLtOlA/+kvlHGV/vCAcY225EOVghFVmhi9NUz7F8BsJVfsaIuivVLhI7bHQeaLAFA1a0Wg8HmIodQhgQn3NcAj4diDguZEbM3ZybKg61vz6cGE38Rr/Zxm8eTHPKETFi/PUabZwllGC2OIS7sS5Pi7M+dxL8gBP0V83yLrbEsQejkYh0Td815lJfCtjURdItKfA8Lz1pnkMRQIkDV7AYdmKXlOL70u1ZlHfMN5Xw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tLqMr-0000kO-26 for guix-patches@gnu.org; Thu, 12 Dec 2024 16:05:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74842] [PATCH 1/4] gnu: bootloader: u-boot: Add u-boot-rockchip-bootloader. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 12 Dec 2024 21:05:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74842 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74842@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17340374732735 (code B ref -1); Thu, 12 Dec 2024 21:05:04 +0000 Received: (at submit) by debbugs.gnu.org; 12 Dec 2024 21:04:33 +0000 Received: from localhost ([127.0.0.1]:40588 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tLqML-0000i2-4V for submit@debbugs.gnu.org; Thu, 12 Dec 2024 16:04:33 -0500 Received: from lists.gnu.org ([209.51.188.17]:39832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tLqMI-0000ht-VQ for submit@debbugs.gnu.org; Thu, 12 Dec 2024 16:04:31 -0500 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 1tLqMC-0004Dx-Gd for guix-patches@gnu.org; Thu, 12 Dec 2024 16:04:24 -0500 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 1tLqM4-0005kV-Dn for guix-patches@gnu.org; Thu, 12 Dec 2024 16:04:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734037448; 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=+sMDLqsxe3IewEti51PKD1ULoF1TwcdbjnRstFfB/hg=; b=VOZjLIurRsvWILnkGdPCtlKMbHSOs9iHhL51mOjQzm3QtxUg6eD1pqwJWxYOMaYnZbeyV+ KwmW/DU4vkTENKp5JDIr8Z0NbN0eA9iMa4XPisXC8blzku0PZah7k03x3GJTdy2xLDj+Pt Upi0Xh9YEiOya17wXW45Nai7QcW15VtKT7beDChlNUyIjbRJrA5l50xbtbFP5pVoERIIeW BqGOh7kxDxpdvVXBN9AQodEeNWeG+xhMmDYxzoiAtwkCF4ZGb4yHsjnCQ0rg+SfpTUi/Vl Lr5r60dmE0hHP7Ef6cBLEfwfDk7pEfkHBajd8rRKmWUgq6vpYrtDyO+q7QQ7cA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 37d05986 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Thu, 12 Dec 2024 21:04:08 +0000 (UTC) Date: Thu, 12 Dec 2024 22:03:25 +0100 Message-ID: <6a1609d369654f967bdcb42bec27357b5f522ebf.1734037218.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches From: Herman Rimm via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -2.17 X-Spam-Score: -2.17 X-Migadu-Queue-Id: 5D6897D69E X-TUID: WVNpxINjD8Gy * gnu/bootloader/u-boot.scm (install-rockchip-u-boot): Add procedure. (install-orangepi-r1-plus-lts-rk3328-u-boot, install-firefly-rk3399-u-boot, install-rock64-rk3328-u-boot, install-rockpro64-rk3399-u-boot, install-pinebook-pro-rk3399-u-boot): Remove procedure. (u-boot-rockchip-bootloader): Add variable. (u-boot-firefly-rk3399-bootloader, u-boot-orangepi-r1-plus-lts-rk3328-bootloader, u-boot-rock64-rk3328-bootloader, u-boot-rockpro64-rk3399-bootloader, u-boot-pinebook-pro-rk3399-bootloader): Inherit u-boot-rockchip-bootloader. [disk-image-installer]: Remove. Change-Id: Icb7546ee2bb1742c12c7b47ff2779d278dd45b14 --- gnu/bootloader/u-boot.scm | 66 ++++++++++----------------------------- 1 file changed, 17 insertions(+), 49 deletions(-) diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index 5e149eaea0..5ea5f418b4 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -111,15 +111,6 @@ (define install-imx-u-boot (write-file-on-device u-boot (stat:size (stat u-boot)) image (* 69 1024))))) -(define install-orangepi-r1-plus-lts-rk3328-u-boot - #~(lambda (bootloader root-index image) - (let ((idb (string-append bootloader "/libexec/idbloader.img")) - (u-boot (string-append bootloader "/libexec/u-boot.itb"))) - (write-file-on-device idb (stat:size (stat idb)) - image (* 64 512)) - (write-file-on-device u-boot (stat:size (stat u-boot)) - image (* 16384 512))))) - (define install-puma-rk3399-u-boot #~(lambda (bootloader root-index image) (let ((spl (string-append bootloader "/libexec/idbloader.img")) @@ -129,25 +120,7 @@ (define install-puma-rk3399-u-boot (write-file-on-device u-boot (stat:size (stat u-boot)) image (* 512 512))))) -(define install-firefly-rk3399-u-boot - #~(lambda (bootloader root-index image) - (let ((idb (string-append bootloader "/libexec/idbloader.img")) - (u-boot (string-append bootloader "/libexec/u-boot.itb"))) - (write-file-on-device idb (stat:size (stat idb)) - image (* 64 512)) - (write-file-on-device u-boot (stat:size (stat u-boot)) - image (* 16384 512))))) - -(define install-rock64-rk3328-u-boot - #~(lambda (bootloader root-index image) - (let ((idb (string-append bootloader "/libexec/idbloader.img")) - (u-boot (string-append bootloader "/libexec/u-boot.itb"))) - (write-file-on-device idb (stat:size (stat idb)) - image (* 64 512)) - (write-file-on-device u-boot (stat:size (stat u-boot)) - image (* 16384 512))))) - -(define install-rockpro64-rk3399-u-boot +(define install-rockchip-u-boot #~(lambda (bootloader root-index image) (let ((idb (string-append bootloader "/libexec/idbloader.img")) (u-boot (string-append bootloader "/libexec/u-boot.itb"))) @@ -156,8 +129,6 @@ (define install-rockpro64-rk3399-u-boot (write-file-on-device u-boot (stat:size (stat u-boot)) image (* 16384 512))))) -(define install-pinebook-pro-rk3399-u-boot install-rockpro64-rk3399-u-boot) - (define install-sifive-unmatched-u-boot #~(lambda (bootloader root-index image) (let ((spl (string-append bootloader "/libexec/spl/u-boot-spl.bin")) @@ -219,6 +190,12 @@ (define u-boot-imx-bootloader (inherit u-boot-bootloader) (disk-image-installer install-imx-u-boot))) +(define u-boot-rockchip-bootloader + ;; SD and eMMC use the same format + (bootloader + (inherit u-boot-bootloader) + (disk-image-installer install-rockchip-u-boot))) + (define u-boot-nintendo-nes-classic-edition-bootloader (bootloader (inherit u-boot-allwinner-bootloader) @@ -250,11 +227,9 @@ (define u-boot-cubietruck-bootloader (package u-boot-cubietruck))) (define u-boot-firefly-rk3399-bootloader - ;; SD and eMMC use the same format (bootloader - (inherit u-boot-bootloader) - (package u-boot-firefly-rk3399) - (disk-image-installer install-firefly-rk3399-u-boot))) + (inherit u-boot-rockchip-bootloader) + (package u-boot-firefly-rk3399))) (define u-boot-mx6cuboxi-bootloader (bootloader @@ -273,9 +248,8 @@ (define u-boot-novena-bootloader (define u-boot-orangepi-r1-plus-lts-rk3328-bootloader (bootloader - (inherit u-boot-bootloader) - (package u-boot-orangepi-r1-plus-lts-rk3328) - (disk-image-installer install-orangepi-r1-plus-lts-rk3328-u-boot))) + (inherit u-boot-rockchip-bootloader) + (package u-boot-orangepi-r1-plus-lts-rk3328))) (define u-boot-pine64-plus-bootloader (bootloader @@ -299,25 +273,19 @@ (define u-boot-puma-rk3399-bootloader (disk-image-installer install-puma-rk3399-u-boot))) (define u-boot-rock64-rk3328-bootloader - ;; SD and eMMC use the same format (bootloader - (inherit u-boot-bootloader) - (package u-boot-rock64-rk3328) - (disk-image-installer install-rock64-rk3328-u-boot))) + (inherit u-boot-rockchip-bootloader) + (package u-boot-rock64-rk3328))) (define u-boot-rockpro64-rk3399-bootloader - ;; SD and eMMC use the same format (bootloader - (inherit u-boot-bootloader) - (package u-boot-rockpro64-rk3399) - (disk-image-installer install-rockpro64-rk3399-u-boot))) + (inherit u-boot-rockchip-bootloader) + (package u-boot-rockpro64-rk3399))) (define u-boot-pinebook-pro-rk3399-bootloader - ;; SD and eMMC use the same format (bootloader - (inherit u-boot-bootloader) - (package u-boot-pinebook-pro-rk3399) - (disk-image-installer install-pinebook-pro-rk3399-u-boot))) + (inherit u-boot-rockchip-bootloader) + (package u-boot-pinebook-pro-rk3399))) (define u-boot-ts7970-q-2g-1000mhz-c-bootloader ;; This bootloader doesn't really need to be installed, as it is read from base-commit: a9003b8e6b40b59c9545ae87bb441d3549630db7 -- 2.45.2