From patchwork Thu Jul 20 01:44:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 51853 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 B696227BBEA; Thu, 20 Jul 2023 02:46:50 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 8FAA227BBE2 for ; Thu, 20 Jul 2023 02:46:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qMIk1-0004qw-Cy; Wed, 19 Jul 2023 21:46: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 1qMIk0-0004qE-2A for guix-patches@gnu.org; Wed, 19 Jul 2023 21:46:04 -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 1qMIjz-0002b5-KG for guix-patches@gnu.org; Wed, 19 Jul 2023 21:46:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qMIjz-0003Q2-Gd for guix-patches@gnu.org; Wed, 19 Jul 2023 21:46:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64149] [PATCH v4 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: Thu, 20 Jul 2023 01:46:03 +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.168981753613042 (code B ref 64149); Thu, 20 Jul 2023 01:46:03 +0000 Received: (at 64149) by debbugs.gnu.org; 20 Jul 2023 01:45:36 +0000 Received: from localhost ([127.0.0.1]:57336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMIjX-0003OD-S3 for submit@debbugs.gnu.org; Wed, 19 Jul 2023 21:45:36 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:33078) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMIjV-0003No-Gz for 64149@debbugs.gnu.org; Wed, 19 Jul 2023 21:45:34 -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 BA0791ABBD; Wed, 19 Jul 2023 18:45:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1689817527; bh=egyhJcioU42WMG1EOknjjuT+nCd2rkym/0nHtSH2qy8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=osLf0FFeTsxEI4a8xHPjWMudNLwXPhUFZByCkPqRMso+nWVzUke4pjZtKyXp4UYdE Qh+Iu2TBAf+gqUb45HWHZRoQlGLp4oMWB6KpD5RZRe7zj0jP/qmXJVGkKCTGK07JqC I14mInyZV0cW4zL4ycS8GLFdfDHV7uYuNq4UilUUGo7lFSAZYC504sB4s/VBcUlExy OKKztKZYpEiPwMsrhzC1Mr4SMQpU74vJT5/ovCOAF+omhgC+gVz+7BQWDXVm/BL4oz rrmM/3agwsgh0baMOt8fDr1usGwamSw1pY2WK+Ke4So05IVZwhLoU+DOk7tLMiiK+q Dopu5a/fb0ldw== From: vagrant@debian.org Date: Wed, 19 Jul 2023 18:44:57 -0700 Message-Id: <20230720014459.242139-4-vagrant@debian.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230720014459.242139-1-vagrant@debian.org> References: <20230720014459.242139-1-vagrant@debian.org> 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: , 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 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 | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 966f1787f8..ea69fc890b 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1010,7 +1010,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 scp-firmware #:key defconfig configs) (let ((base (make-u-boot-package board triplet #:defconfig defconfig #:configs configs))) @@ -1022,23 +1022,27 @@ (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 scp-firmware))) (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")))