From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 AFZ4NgmSuGTWSgEASxT56A (envelope-from ) for ; Thu, 20 Jul 2023 03:46:50 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id KAh8NQmSuGRErQAAG6o9tA (envelope-from ) for ; Thu, 20 Jul 2023 03:46:49 +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 98F623DC1D for ; Thu, 20 Jul 2023 03:46:49 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=osLf0FFe; 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=1689817609; 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=p0FG88SvV82d9s6kNmd5NpSWW5V93jLh3eS0aDEGpVo=; b=tas2QR8bXRUKHm6lMAQlEWjhqHjoAEBInEqty/7rXyA3u11f5SU+EZ6eOJ0Ph8hPGeVXuc VscpjjAtyuwCEcpd2S/hQwkyDiZJW35KxmMHhL+kMKzGhoVab+UZFHfW4syeBqAg4YugIz XIKj8/qtmHwsthvGq3QA/dnfoQ7yByFu9Q8KC0xBp++T1EU1RV0qS8lq1JNMetAVlV8zlq vHCMQN7LYOodRNnJusnGlKA4x/HYHOrMiuUjhQLqAox9geo1hcMeLd03js9qaCQsBVITV5 G48sbZ3Nbt8Mzr4RHY5UignhriG+vOswb2CtaJHRrop75s0XU8V9OdV2dRn0KQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1689817609; a=rsa-sha256; cv=none; b=BM1TS+cKMle46IwxFG0OzsOm/hwJwCtlWeb7Di9f8J3KIQI6o212eV2Db1Pgn8nr4kRLUg m0oIoen3VfpqHeFSdNKBG+W4amTH/+4KkHUEy5QtxAc7upO9WKfNlW1n9dfwCNSLSivvvZ 72xZ1xNAsanTAp4eXAgMmdSj8iYkmhEgeXxIg+dadKvZyrvxAcZHGOCe7DLvXzCWYmzTjj zG5r3dEKhU3+oC6HNH3wW3pUiwtChIxLs0dqL7gi/bsMX7RGezciYRwfMlzr4OiQMS6CPN d4prY3zCUlYn7gttQKthfYsUPYUjz+Awm6JhdadkpLfrHLOGZmljBWhZgDAhFw== 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=osLf0FFe; 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 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 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx2.migadu.com X-Migadu-Spam-Score: 2.36 X-Spam-Score: 2.36 X-Migadu-Queue-Id: 98F623DC1D X-TUID: 5Nv0ZrYHyjAG 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"))) -- 2.39.2