From patchwork Sat Nov 13 18:51:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 34427 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 8337E27BBE3; Sat, 13 Nov 2021 18:52:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3F6BF27BBE1 for ; Sat, 13 Nov 2021 18:52:25 +0000 (GMT) Received: from localhost ([::1]:34672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mly8W-00054U-71 for patchwork@mira.cbaines.net; Sat, 13 Nov 2021 13:52:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mly8A-00054K-9n for guix-patches@gnu.org; Sat, 13 Nov 2021 13:52:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36524) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mly8A-00085I-19 for guix-patches@gnu.org; Sat, 13 Nov 2021 13:52:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mly89-0005dc-QZ for guix-patches@gnu.org; Sat, 13 Nov 2021 13:52:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#48314] Patches to install guix system on Raspberry Pi Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Nov 2021 18:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48314 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Stefan , 48314@debbugs.gnu.org Cc: Danny Milosavljevic Received: via spool by 48314-submit@debbugs.gnu.org id=B48314.163682951521660 (code B ref 48314); Sat, 13 Nov 2021 18:52:01 +0000 Received: (at 48314) by debbugs.gnu.org; 13 Nov 2021 18:51:55 +0000 Received: from localhost ([127.0.0.1]:48070 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mly83-0005dH-JU for submit@debbugs.gnu.org; Sat, 13 Nov 2021 13:51:55 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:38720) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mly81-0005d5-VT for 48314@debbugs.gnu.org; Sat, 13 Nov 2021 13:51:54 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:21:21:0:100e]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id A589E1AC25; Sat, 13 Nov 2021 10:51:47 -0800 (PST) From: Vagrant Cascadian In-Reply-To: <87czn4aq2s.fsf@ponder> References: <20210619211026.5eb44073@scratchpost.org> <897B7FF7-24C1-4B96-8441-415596267E99@vodafonemail.de> <87czn4aq2s.fsf@ponder> Date: Sat, 13 Nov 2021 10:51:38 -0800 Message-ID: <875ysvc2it.fsf@ponder> 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" X-getmail-retrieved-from-mailbox: Patches On 2021-11-13, Vagrant Cascadian wrote: > Subject: [PATCH 3/8] * gnu/packages/bootloader.scm (make-u-boot-package): Add > keyword parameters 'name' and 'description'. > ... > (u-boot-rpi-0-w, u-boot-rpi, u-boot-rpi-2, u-boot-rpi-3, > u-boot-rpi-4, u-boot-rpi-64, u-boot-rpi-0-w-efi, u-boot-rpi-efi, > u-boot-rpi-2-efi, u-boot-rpi-3-efi, u-boot-rpi-4-efi, u-boot-rpi-efi-64): New > packages. ... > +(define-public u-boot-rpi-64 > + (make-preinstalled-u-boot-package > + "rpi_arm64" > + "aarch64-linux-gnu" > + #:name "rpi-64" > + #:description %u-boot-rpi-description-64-bit)) > > And this "u-boot-rpi-arm64". > > In other words, keep names consistent with the upstream defconfig they > are based on. ... > I think without addressing the rest of the patch series, adding to guix > master the following packages could make the remaining diff smaller: > > u-boot-rpi-2 (rpi_2_defconfig) > u-boot-rpi-3-32b (rpi_3_32b_defconfig) > u-boot-rpi-4-32b (rpi_4_32b_defconfig) > u-boot-rpi-arm64 (rpi_arm64_defconfig) Patch that builds, but haven't tested on an actual board (do have rpi2 and rpi3b+ could test sometime): Which leads me to wonder, why have the name and description argument at all, when you could just inherit and set the name, like done with the boneblack? (define-public u-boot-am335x-boneblack (let ((base (make-u-boot-package "am335x_evm" "arm-linux-gnueabihf"))) (package (inherit base) (name "u-boot-am335x-boneblack") (description "U-Boot is a bootloader used mostly for ARM boards. It also initializes the boards (RAM etc). ... And of course, thanks for working on this! :) live well, vagrant diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 706ddf0207..f5a3fd51e0 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -994,6 +994,18 @@ (define-public u-boot-pinebook-pro-rk3399 `(("firmware" ,arm-trusted-firmware-rk3399) ,@(package-native-inputs base)))))) +(define-public u-boot-rpi-2 + (make-u-boot-package "rpi_2" "arm-linux-gnueabihf")) + +(define-public u-boot-rpi-3-32b + (make-u-boot-package "rpi_3_32b" "arm-linux-gnueabihf")) + +(define-public u-boot-rpi-4-32b + (make-u-boot-package "rpi_4_32b" "arm-linux-gnueabihf")) + +(define-public u-boot-rpi-arm64 + (make-u-boot-package "rpi_arm64" "aarch64-linux-gnu")) + (define-public vboot-utils (package (name "vboot-utils")