From patchwork Mon Mar 31 18:19:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 41088 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 43B7927BBEA; Mon, 31 Mar 2025 19:21:42 +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_DNSWL_BLOCKED, 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 AFC2727BBE2 for ; Mon, 31 Mar 2025 19:21:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tzJl4-0002mM-78; Mon, 31 Mar 2025 14:21: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 1tzJkv-0002lE-Ql for guix-patches@gnu.org; Mon, 31 Mar 2025 14:21:08 -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 1tzJkt-0006ol-GM for guix-patches@gnu.org; Mon, 31 Mar 2025 14:21:04 -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=a8mtgIppAYeScFAZq+EPt2rHcJ2kjnVYpvx350KeJdo=; b=izK2kQAtc5qdWlJw+fk4f4hC+s7QbhEmg72H/Pp+2EdcQ3ceESxdQVAWU/qPuPvQMCMkQPq6CvVa5wOBE8iftearjxxUvHu+RCtoa1vxxH2eGsnsqlJx2ti7IdjSCLkMbGq57U8kpkK7gIjwHT3/NO/KAiv/cGHAToQFYj0CH6BZrRxaqquohALluA1TTa927+uCA/C9fAX+nCbNtO5lUD3TYU14VDtvKp49l4K19p6073iQorXU5SH370S5zRQ3er6c0BJDR9xCt6fdxHo5bTEMOE5uJuAS9mO0hJ0V/O/i6Pql9pMXfh1TGqfady9XJqcV6Oez0vcTxFMhy1M4nQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tzJkt-0003JC-1q for guix-patches@gnu.org; Mon, 31 Mar 2025 14:21:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72987] [PATCH v4 2/3] gnu: bootloader: Add ASUS Tinker Board S bootloader. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 Mar 2025 18:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72987 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72987@debbugs.gnu.org Received: via spool by 72987-submit@debbugs.gnu.org id=B72987.174344524712568 (code B ref 72987); Mon, 31 Mar 2025 18:21:02 +0000 Received: (at 72987) by debbugs.gnu.org; 31 Mar 2025 18:20:47 +0000 Received: from localhost ([127.0.0.1]:42800 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tzJkd-0003GY-1w for submit@debbugs.gnu.org; Mon, 31 Mar 2025 14:20:47 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:42135 helo=email.rimm.ee) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tzJkO-0003DN-VQ for 72987@debbugs.gnu.org; Mon, 31 Mar 2025 14:20:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1743445219; 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=a8mtgIppAYeScFAZq+EPt2rHcJ2kjnVYpvx350KeJdo=; b=WO6Mjnr4Z+1ODUEx4D7lUp4kyv9QbxiriexjyQTa4DbKQJzapeE+zhIfvYzSaqZ/5xAMig J+VPrSM5hcoq5Voh5voL1D6/wqY7n8oRKiVNSaVVOBbC9Eld8GKEnys+4FrENLUrg9LtyJ OAHlmr/3Fww0p+U7V9Y6vV+geItfsRDaQGOaxl9pLdb/di7v/1ODS+ikaDDrXE85MO2ScP 08Q3RGJ9R99+LU6/2CqtyaGt01IqZqwIlTzZmfWJRyUtFw1zPbXjCP8OnTXtm0UBdaD+C9 mBp5Ft9REX9MHGBZ2oHv1qs31lMzF51Qgz6p0789/26A2fAxChLh7Dag7F2nHQ== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id d97a7119 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <72987@debbugs.gnu.org>; Mon, 31 Mar 2025 18:20:19 +0000 (UTC) Date: Mon, 31 Mar 2025 20:19:26 +0200 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/bootloader/u-boot.scm (install-tinker-s-rk3288-u-boot, u-boot-tinker-s-rk3288-bootloader): Add variables. * gnu/packages/bootloaders.scm (u-boot-tinker-s-rk3288): Add variable. * gnu/packages/firmware.scm (arm-trusted-firmware-rk3288): Add variable. Change-Id: Ic28193d4377c672f4cbbac4cc059e283fcfb06e0 --- gnu/bootloader/u-boot.scm | 10 ++++++++++ gnu/packages/bootloaders.scm | 19 +++++++++++++++++++ gnu/packages/firmware.scm | 6 ++++++ 3 files changed, 35 insertions(+) diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index a7c73093bd6..8acf8af785b 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -53,6 +53,7 @@ (define-module (gnu bootloader u-boot) u-boot-sifive-unmatched-bootloader u-boot-qemu-riscv64-bootloader u-boot-starfive-visionfive2-bootloader + u-boot-tinker-s-rk3288-bootloader u-boot-ts7970-q-2g-1000mhz-c-bootloader u-boot-wandboard-bootloader)) @@ -115,6 +116,9 @@ (define install-puma-rk3399-u-boot (define install-rockchip-u-boot (write-u-boot-image '(("idbloader.img" 64) ("u-boot.itb" 16384)) 512)) +(define install-tinker-s-rk3288-u-boot + (write-u-boot-image '(("idbloader.img" 64) ("u-boot.img" 16384)) 512)) + (define install-sifive-unmatched-u-boot (write-u-boot-image '(("spl/u-boot-spl.bin" 34) ("u-boot.itb" 2082)) 512)) @@ -273,6 +277,12 @@ (define u-boot-pinebook-pro-rk3399-bootloader (inherit u-boot-rockchip-bootloader) (package u-boot-pinebook-pro-rk3399))) +(define u-boot-tinker-s-rk3288-bootloader + (bootloader + (inherit u-boot-bootloader) + (package u-boot-tinker-s-rk3288) + (disk-image-installer install-tinker-s-rk3288-u-boot))) + (define u-boot-ts7970-q-2g-1000mhz-c-bootloader ;; This bootloader doesn't really need to be installed, as it is read from ;; an SPI memory chip, not the SD card. It is copied to /boot/u-boot.imx diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 1953222ae12..5a030360226 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -39,6 +39,7 @@ (define-module (gnu packages bootloaders) #:use-module (gnu packages) + #:use-module (gnu packages algebra) #:use-module (gnu packages assembly) #:use-module (gnu packages base) #:use-module (gnu packages disk) @@ -1325,6 +1326,24 @@ (define-public u-boot-cubietruck (define-public u-boot-puma-rk3399 (make-u-boot-rockchip-package "puma" 'rk3399)) +(define-public u-boot-tinker-s-rk3288 + (let ((base (make-u-boot-package "tinker-s-rk3288" "arm-linux-gnueabihf"))) + (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) + ;; ARMv7 does not have the BL31 stage. + (setenv "BL32" (search-input-file inputs "/bl32.elf")))))))) + (native-inputs + (modify-inputs (package-native-inputs base) + (append bc))) + (inputs (modify-inputs (package-inputs base) + (append arm-trusted-firmware-rk3288)))))) + (define-public u-boot-qemu-arm (make-u-boot-package "qemu_arm" "arm-linux-gnueabihf" ;; Disable features that require OpenSSL due diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index f04edefafe8..ba3dfae715b 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1198,6 +1198,12 @@ (define-public arm-trusted-firmware-sun50i-a64 (define-public arm-trusted-firmware-sun50i-h616 (make-arm-trusted-firmware "sun50i_h616")) +(define-public arm-trusted-firmware-rk3288 + (make-arm-trusted-firmware "rk3288" #:triplet "arm-linux-gnueabihf" + #:make-flags '("ARCH=aarch32" + "AARCH32_SP=sp_min" + "DEBUG=1"))) + (define-public arm-trusted-firmware-rk3328 (make-arm-trusted-firmware "rk3328"))