From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id ckgCMyISqmSPzAAASxT56A (envelope-from ) for ; Sun, 09 Jul 2023 03:49:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 2Bi+MiISqmR4dQEA9RJhRA (envelope-from ) for ; Sun, 09 Jul 2023 03:49:22 +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 0B84240597 for ; Sun, 9 Jul 2023 03:49:22 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=kJS09RSG; 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=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1688867362; h=from:from:sender:sender: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=Qsqg7XonSJmU/kQMhh/p1Hno3QWRhY+3zRW1lHF7pf4=; b=PEpZAIElS/Mo1Hx/vnJD+YiGCMfjSzIzbRk+0+QDwFUJTxFrqephMy9/gEuxX74l+U5J/w RInkdqMdWt9ALgimONqD508iTfqKf6ljA5uV0SmWFslVAbfH0H2k5TstOeql6feLgNv0bS sYywj3iLZpe3345Aktg5vpE6T5V3Pe9IuaeSpDlBfmqnUi22T9CILXt0qw3EpjvmMJ8ktZ i4jMx+W2MQnBr9uEAxnxJtJL5JMu/IEiTYswG5mh46u0tdXzi3AHI7GBlOPKbzdtN70kID rI/t+0f0GgF35gkyfs9rbSxImDAFW19hQVerdFtCYaW6bWP9KL1WZW4u0JCZCg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1688867362; a=rsa-sha256; cv=none; b=HNwpPkJxv3coGXnSK3NJqrej6YKPODsX7VRkdBa4FkmR4dnoJhjz+YcFmaCOuNVfO3vBHm u1SgRSjHkFHK01EBRTdv3TPlRjnimQZI2mquL3j9sBUYmyEfj+yfJgnB38QphqibluBf69 ToeFBfXYtBHdxRJde4FffqbE8F3fpnKJki8wfX3RPR3rh5c2rD7YtziODAwgLECe8D4VeW Vn6wfwZk9klm+e9lMwf6ya+vZikYFLKg/2zAIuRMhFuI5YqWvP6Y+g3qgSUxb7IB0P/gdy tfCErzLmfyMrNmXnAMZYT8OwfwEqJmMTQp2xlK0ckWZYT4H3/lbG3RWvvQbaow== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=kJS09RSG; 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=none Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qIJXt-0007N9-7q; Sat, 08 Jul 2023 21:49: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 1qIJXr-0007Mg-IL for guix-patches@gnu.org; Sat, 08 Jul 2023 21:49:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qIJXr-00022e-A7 for guix-patches@gnu.org; Sat, 08 Jul 2023 21:49:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qIJXq-000889-W7 for guix-patches@gnu.org; Sat, 08 Jul 2023 21:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64149] [PATCH 3/5] gnu: u-boot: Add crust firmware to pinebook, pine64_plus and pine64-lts. Resent-From: vagrant@debian.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Jul 2023 01:49: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: 64149@debbugs.gnu.org Cc: vagrant@debian.org, ludo@gnu.org, efraim@flashner.co.il, maxim.cournoyer@gmail.com Received: via spool by 64149-submit@debbugs.gnu.org id=B64149.168886731031136 (code B ref 64149); Sun, 09 Jul 2023 01:49:02 +0000 Received: (at 64149) by debbugs.gnu.org; 9 Jul 2023 01:48:30 +0000 Received: from localhost ([127.0.0.1]:45383 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qIJXJ-000865-V2 for submit@debbugs.gnu.org; Sat, 08 Jul 2023 21:48:30 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:42044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qIJXI-000858-2T for 64149@debbugs.gnu.org; Sat, 08 Jul 2023 21:48:28 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id E141C1ACEB; Sat, 8 Jul 2023 18:48:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1688867300; bh=X0tJZGsYX3YCJNUA8yk+m6YpYcePtvGybifh7cE5Chs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kJS09RSGbqv2P3MFC6afj0dqEmUbIFaN5iOKEjFQYsoguqcU5XaowrUwUsI2/6QvN I26ZeTiQMJfU7iqB67AKu+DjJJVnOuVlCRvme5PpILPbTvFtC6PSX69gyHDXhFZ2Fz 6Ts2+iUFedLKLbVU6c5jK0fcklFSkTPt8Qkr1Jog1c1E4ruVbyyBZOqUqFIf4eY4+c Ir4KiDocj5b0pa8rB6PLmur70uV5UEP3krgWxyX6StMzKVcG1cT5NcusQB9hvNQ8kM BLXDXaQrkaGKgLdK1ZAgPaVi0nYXPPfCOTtR9J0qaYhlc/29JHWUXbmzuNK0F8CHE0 5WSDfJwhcaIlA== From: vagrant@debian.org Date: Sat, 8 Jul 2023 18:47:34 -0700 Message-Id: <20230709014736.54114-3-vagrant@debian.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230709014736.54114-1-vagrant@debian.org> References: <87zg45g8yg.fsf@wireframe> <20230709014736.54114-1-vagrant@debian.org> 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: , 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-Spam-Score: -2.28 X-Spam-Score: -2.28 X-Migadu-Queue-Id: 0B84240597 X-Migadu-Scanner: mx2.migadu.com X-TUID: Ij/MimIknfNb 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. --- 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 8be5303a74..18f6398692 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) (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"))) -- 2.39.2