From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id +PRhBq8IsmS2KQEASxT56A (envelope-from ) for ; Sat, 15 Jul 2023 04:47:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id YCtkBq8IsmR/CgAAauVa8A (envelope-from ) for ; Sat, 15 Jul 2023 04:47:11 +0200 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 A473858B3D for ; Sat, 15 Jul 2023 04:47:10 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=XnV+y1M7; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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=1689389230; a=rsa-sha256; cv=none; b=hr+17hgHShq5GsfdiDhh5IKF2B98+zckeVfisNpqrjHOVGA4DJqZ73/0zEpgJJLHBRayqJ KW0cDBJjUgeQ7LK7iHl7mLsWCSBA/X05Bi4KgftmSqqYTkbD1sTdJdv+mVrciwM7RIXhnv 6jRNhDVNQ+v+WoqM5kB0pS/A7Uch2foDFy8Lz6ZhTCj3IRzPDUOLdYnlQ55L9tt8Wt53e+ L0ZyM4S0pRMousvypH01vKnoAtwCv0xbJaI2MLqCOKdz/XayAeVJFHPecN/rhPecL7Ur2j 6JmNOfRiA/v1/GscoXX6lRIaK8cvQK+bJln+Itw+J53SrtLlu7V/37VgEmBoLg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=XnV+y1M7; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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=1689389230; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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=w4nHIV3jKcoW2deZpgg5ZVsByZMo2HaBLmDDlz1LL2A=; b=PGG0lyZ+GotvzjHxlu32xzuKCm2RRZ8AbKYPsTmw7uqZ0ndQd11cNmLdhBnZD8PFqccEim L9axzka09kTb4yUgHRn83f3Zo6m4iW1ZtHiUqx1g3huOaO0vf3GgXK1wV64urgVTGFIUOz zymwR25xsXQA4cA2GIkaQ93LI5MG4GV9x2SiQxx9BGtoXC9YBlobLIzSnfhCYOVAl7eBxN nhIbvzBNc32QDk1RZ7mzNSV696ALAXqX9+nDipodx/O4wwsZgl5ppJVpMG2MELtpmfDDQ7 cWCMO8n3GR9aCAEAw7sFN/vcl1gTSoZ2ldiBcU77/+i11r2UoobghvyMcJW1ng== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qKVJJ-0003AC-7u; Fri, 14 Jul 2023 22:47:05 -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 1qKVJH-00039i-4q for guix-patches@gnu.org; Fri, 14 Jul 2023 22:47:03 -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 1qKVJG-0003pI-Sv for guix-patches@gnu.org; Fri, 14 Jul 2023 22:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qKVJG-0007AH-Fo for guix-patches@gnu.org; Fri, 14 Jul 2023 22:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64149] [PATCH v3 3/6] gnu: u-boot: Add crust firmware to pinebook, pine64_plus and pine64-lts. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Jul 2023 02:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64149 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: vagrant@debian.org Cc: 64149@debbugs.gnu.org, ludo@gnu.org, efraim@flashner.co.il Received: via spool by 64149-submit@debbugs.gnu.org id=B64149.168938919827502 (code B ref 64149); Sat, 15 Jul 2023 02:47:02 +0000 Received: (at 64149) by debbugs.gnu.org; 15 Jul 2023 02:46:38 +0000 Received: from localhost ([127.0.0.1]:43735 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKVIr-00079V-E9 for submit@debbugs.gnu.org; Fri, 14 Jul 2023 22:46:37 -0400 Received: from mail-qk1-x731.google.com ([2607:f8b0:4864:20::731]:61867) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKVIp-00079H-6A for 64149@debbugs.gnu.org; Fri, 14 Jul 2023 22:46:36 -0400 Received: by mail-qk1-x731.google.com with SMTP id af79cd13be357-7653bd3ff2fso264589385a.3 for <64149@debbugs.gnu.org>; Fri, 14 Jul 2023 19:46:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689389189; x=1691981189; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=w4nHIV3jKcoW2deZpgg5ZVsByZMo2HaBLmDDlz1LL2A=; b=XnV+y1M7z6hfgNZZTP2sy96XD49Cy7PCOVrT3axHq3t7OOo7VxoTSWWeS3O9nDJigX FQDKJ2MnYUgJ8Q6jv2ck/IMQcNfh5nAnnaC1JVo9HjJp3dY6RwlLUqJVuApQ7T8xkZsu kex8RMg0OKbvHr9qCMopcnuYAMs82Hq+c5+VX3gc0gAwdSEF5OApiwdObxe4WB6CAIog IVsaMHKjzIp+dn4NIYxZc9ekO1BIKfwf0pMfrKDdjtmdnMw4+KHw+mvt8xGmffPY3RhU Bsiu/negYYDWn7Pp/bhmVtUWZSZyzSKhkW7bON9dtbKRmhP0sWpu1iLAp9hVDrfH8/60 oNPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689389189; x=1691981189; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=w4nHIV3jKcoW2deZpgg5ZVsByZMo2HaBLmDDlz1LL2A=; b=h6rJpOeXr/Woemg52x7wPSp4T3EtjV6N/z850gwjrSTwjNyHgh+k0wrHHJDL/70siq EpYKaXdhu4gJ9a/mJrqpsxehWYqCHG24cvBdGF/Bzyl2/QXYVY9XvQ7dgEFJS4vSOs+e 0sqoPYXdLfU6n8mTgEGjIyDYrcAj9lAG+Cux2g8cmh88zyKYZLpQcbAu1F3ssFu04RW7 FynR8HKQWHCt2syuVNFImMEfiTR0ETOsKqRIHWUP3dx56KYuP0xQcrFYH98aNZnYxefF xULIx09GPzigkBPpVNiiscd+umJRONMN0NYgHLWBwq9EyykWytYIAqlv/pl1XWg/Nvak p48A== X-Gm-Message-State: ABy/qLZ4GS1D+nAJM2jQjGK4ZXonEkhG3qQSR9HWbzPc6zGQ0KcuzYfJ qtcxsSYbu9LQtBtJqLjz318= X-Google-Smtp-Source: APBJJlFk5JO0vCOnfjv2NhmzRNzdZJDw/CuBOj6pSQp0Zk+D48JfR8yXflojKnKSTGFwDrlLAAjFzA== X-Received: by 2002:ac8:7dc4:0:b0:3fd:e517:43c8 with SMTP id c4-20020ac87dc4000000b003fde51743c8mr9736704qte.37.1689389189679; Fri, 14 Jul 2023 19:46:29 -0700 (PDT) Received: from hurd (dsl-205-151-56-16.b2b2c.ca. [205.151.56.16]) by smtp.gmail.com with ESMTPSA id m15-20020aed27cf000000b003e0945575dasm4528337qtg.1.2023.07.14.19.46.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 19:46:29 -0700 (PDT) From: Maxim Cournoyer References: <874jm95gmz.fsf@wireframe> <20230712145206.298746-1-vagrant@debian.org> <20230712145206.298746-3-vagrant@debian.org> Date: Fri, 14 Jul 2023 22:46:28 -0400 In-Reply-To: <20230712145206.298746-3-vagrant@debian.org> (vagrant@debian.org's message of "Wed, 12 Jul 2023 07:52:03 -0700") Message-ID: <875y6lx56j.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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: , 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-Queue-Id: A473858B3D X-Migadu-Spam: Yes X-Spam: Yes X-Migadu-Scanner: mx1.migadu.com X-Migadu-Spam-Score: 7.59 X-Spam-Score: 7.59 X-TUID: L9i2/TCYhe5T Hi, vagrant@debian.org writes: > From: Vagrant Cascadian > > * gnu/packages/bootloaders.scm (make-u-boot-sunxi64-package): Take argument > for System Control Processor (SCP) firmware. > [native-inputs]: Add SCP firmware. > [phases]: Adjust 'set-environment to also set SCP variable. > (u-boot-pine64-plus, u-boot-pine64-lts, u-boot-pinebook): Pass appropriate > crust firmware as the SCP firmware. Nitpick: extraneous hanging indent in ChangeLog-style commit message. > --- > gnu/packages/bootloaders.scm | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm > index d1633b2b70..afea47b457 100644 > --- a/gnu/packages/bootloaders.scm > +++ b/gnu/packages/bootloaders.scm > @@ -1009,7 +1009,7 @@ (define-public u-boot-am335x-boneblack > (define-public u-boot-am335x-evm > (make-u-boot-package "am335x_evm" "arm-linux-gnueabihf")) > > -(define*-public (make-u-boot-sunxi64-package board triplet > +(define*-public (make-u-boot-sunxi64-package board triplet scpfirmware > #:key defconfig configs) I'd name the argument 'scp-firmware'. > (let ((base (make-u-boot-package > board triplet #:defconfig defconfig #:configs configs))) > @@ -1021,22 +1021,24 @@ (define*-public (make-u-boot-sunxi64-package board triplet > #~(modify-phases #$phases > (add-after 'unpack 'set-environment > (lambda* (#:key native-inputs inputs #:allow-other-keys) > - ;; Avoid dependency on crust-firmware https://issues.guix.gnu.org/48371 > - (setenv "SCP" "/dev/null") > + (setenv "SCP" (search-input-file native-inputs "libexec/scp.bin")) > (setenv "BL31" (search-input-file inputs "bl31.bin")))))))) > + (native-inputs > + (modify-inputs (package-native-inputs base) > + (append scpfirmware))) > (inputs > (modify-inputs (package-inputs base) > (append arm-trusted-firmware-sun50i-a64)))))) > > (define-public u-boot-pine64-plus > - (make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu")) > + (make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu" crust-pine64-plus)) > > (define-public u-boot-pine64-lts > - (make-u-boot-sunxi64-package "pine64-lts" "aarch64-linux-gnu")) > + (make-u-boot-sunxi64-package "pine64-lts" "aarch64-linux-gnu" crust-pine64-plus)) > > (define-public u-boot-pinebook > (make-u-boot-sunxi64-package > - "pinebook" "aarch64-linux-gnu" > + "pinebook" "aarch64-linux-gnu" crust-pinebook > ;; Fix regression with LCD video output introduced in 2020.01 > ;; https://patchwork.ozlabs.org/patch/1225130/ > #:configs '("CONFIG_VIDEO_BPP32=y"))) nitpick: Please break lines touched larger than 80 characters. The rest LGTM! -- Thanks, Maxim