From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id mOcVEJyiXGc8aQAA62LTzQ:P1 (envelope-from ) for ; Fri, 13 Dec 2024 21:09:48 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id mOcVEJyiXGc8aQAA62LTzQ (envelope-from ) for ; Fri, 13 Dec 2024 22:09:48 +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=ezsvYlls; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=UhIpEnyR; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734124188; a=rsa-sha256; cv=none; b=HHKWM7yq7jnRVB+uVkrEdIftqnxKQ4cnT5rLUE5DvzuV4h4bu3hvzNspRxza00q0D0j3Gr H9j2LEwDghi3o0r5tFAAI1RgsmgNFIAuLCH5BiZhIi1o5n9xpDCSSeaINRgqOYfaPr3+Hd /YHNjSAVON96lzK+zDlPCp4x1iobDZh/px3vYk1Q8KXqziBWTdM0K1UydYrcvvXEq8/pfS Qx2Gjwi0kNr3ZA6i0tfB5DX6yVih5eSYARcBDoaJvqb4qgzP6wwUcCmsA1MoZFmDWmPK5j nXelQAd2kzWLgM2YcLnNfRtKKXFhxOFa21oazaSrhAlb90ve24htAw1rN5Bafw== 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=ezsvYlls; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=UhIpEnyR; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734124188; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=vNDFefsfnvXwNVX+uKThbqEWfBS1obeUtxXfD+eoW+8=; b=SKJs4u2B04DwqLt1jp/wU9D6IGKJadHnouRltFpIfWY+M1ZbuqbSLKv+QnwIC25Z/r8L0S GBkLNkm5IeoK6SFuBQSW+P7Muxghpa4mT7TYxJGefdsBKOIz/xOd8ECEwW9dOSTPoWJ67M +MNfaQh6yD7yFUIcWK+5Uee1bR52IQbsaztushlZOIeFekbrc5+8MifHJnjPzazzLdaAiP YL1UXSkMKOzgYTky4q2UKLTyXyslOzQx4GuoS+9KHVexbygVOLaOEm+80DH+jGeZES0loZ tTcqjzibApfor9BBV53snT90Ap0h1zywjdZgRoWHi4mYyjocjrQUoHiX7hXIZg== 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 CF8D87444 for ; Fri, 13 Dec 2024 22:09:47 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tMCuk-00086L-QA; Fri, 13 Dec 2024 16:09:34 -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 1tMCuG-0007sB-Ko for guix-patches@gnu.org; Fri, 13 Dec 2024 16:09:05 -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 1tMCuG-00056v-C2 for guix-patches@gnu.org; Fri, 13 Dec 2024 16:09:04 -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:References:In-Reply-To:Date:From:To:Subject; bh=vNDFefsfnvXwNVX+uKThbqEWfBS1obeUtxXfD+eoW+8=; b=ezsvYllsj5+Gb7meUwhwOUHdt14CexfBsi5N5Omcn3jJnqQIhRcWAj/qD2ygFvlJ8SGMFsndBYeJ8F8+OXDMOvYzCHX7iAFX8SqR23WP/PHLXOi8B8QLBeGH0kBmpCRZuj40fIn2qos0w5vdJhDPOGeHbI4dd/DIfcrD5V9KxfIbcEc/22aXp9ETfdajrZf42CVorIdiTZQIqtTBoLUnCXqe+3l/NiJSEWZtEUo7zT03/3mBIa1tF7XJ39fUakgkCk/H0I0IpFUOBMAyTIj9t5HMOm3dsaoBReYdvAMxnw6nShhK9yxXeJhwN0ZQ0mKL6mOZPXqTYZVGEYIxHPfIIg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tMCuG-0004DT-5y; Fri, 13 Dec 2024 16:09:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#72987] [PATCH v3 5/5] gnu: bootloader: Add ASUS Tinker Board S bootloader. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Fri, 13 Dec 2024 21:09:04 +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 Cc: Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 72987-submit@debbugs.gnu.org id=B72987.173412413816154 (code B ref 72987); Fri, 13 Dec 2024 21:09:04 +0000 Received: (at 72987) by debbugs.gnu.org; 13 Dec 2024 21:08:58 +0000 Received: from localhost ([127.0.0.1]:44354 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMCu9-0004CN-Ul for submit@debbugs.gnu.org; Fri, 13 Dec 2024 16:08:58 -0500 Received: from [81.205.150.117] (port=36535 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMCu4-0004B5-Ax for 72987@debbugs.gnu.org; Fri, 13 Dec 2024 16:08:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734124101; 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=vNDFefsfnvXwNVX+uKThbqEWfBS1obeUtxXfD+eoW+8=; b=UhIpEnyRG1+UWav7bDum4nqyy9TdVRIE/52Ny2iZlPUHBhO84t/aOOmETUYJR0y14HRLtM cdu95EKf2Uyz1uIiKbv9f9IuO/Et3yyF3Y1jxSJgTcuPqLNMxI5lwyR1DH4+I64jDYafuN m9mEw82sBYEz8bQoAsrwtdZQnJXkBinXNB9Bb/68Spiy1QHcOP5o5yR3DrlVR6vtFcm/qV tbbZ7d/elPvLP77VHJXWqQlO/val8aJoFE2e/wnpfnH0AVJ5hnYVFlocKvcRgt8qQilofG rWOkGLHx4iqkhG3UYSfFuGg5umsZOOOjAwLoAZPkWUXlhumdeStBmWb/0T26ng== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id d7472d2f (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <72987@debbugs.gnu.org>; Fri, 13 Dec 2024 21:08:21 +0000 (UTC) Date: Fri, 13 Dec 2024 22:07:36 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -2.17 X-Spam-Score: -2.17 X-Migadu-Queue-Id: CF8D87444 X-Migadu-Scanner: mx12.migadu.com X-TUID: kDXdoA1g4e6e * 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)[native-inputs]: Add bc. (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 | 20 +++++++++++++++++++- gnu/packages/firmware.scm | 6 ++++++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index 52527ab0db..0d6cd5c6a8 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 b91ff00e28..4516e343b2 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) @@ -763,7 +764,8 @@ (define u-boot "u-boot-rockchip-inno-usb.patch")))) (build-system gnu-build-system) (native-inputs - (list bison + (list bc + bison dtc gnutls flex @@ -1308,6 +1310,22 @@ (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")))))))) + (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 d89b136c86..670cef5a02 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1171,6 +1171,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")) -- 2.45.2