From patchwork Mon Oct 14 06:01:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nomble@palism.com X-Patchwork-Id: 15721 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 3AFA91759F; Mon, 14 Oct 2019 13:21:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E516517530 for ; Mon, 14 Oct 2019 13:21:11 +0100 (BST) Received: from localhost ([::1]:48812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iJzLb-0003nx-5c for patchwork@mira.cbaines.net; Mon, 14 Oct 2019 08:21:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35587) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iJtRj-0003xH-1P for guix-patches@gnu.org; Mon, 14 Oct 2019 02:03:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iJtRh-000679-84 for guix-patches@gnu.org; Mon, 14 Oct 2019 02:03:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57107) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iJtRf-00065t-DS for guix-patches@gnu.org; Mon, 14 Oct 2019 02:03:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iJtRf-0006qo-8X for guix-patches@gnu.org; Mon, 14 Oct 2019 02:03:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37741] [PATCH 3/3] gnu: Add u-boot-rockpro64-rk3399 Resent-From: nomble@palism.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Oct 2019 06:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37741 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37741@debbugs.gnu.org Cc: Vagrant Cascadian , Danny Milosavljevic , Caliph Nomble Received: via spool by 37741-submit@debbugs.gnu.org id=B37741.157103294425894 (code B ref 37741); Mon, 14 Oct 2019 06:03:03 +0000 Received: (at 37741) by debbugs.gnu.org; 14 Oct 2019 06:02:24 +0000 Received: from localhost ([127.0.0.1]:37687 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iJtR1-0006j6-De for submit@debbugs.gnu.org; Mon, 14 Oct 2019 02:02:23 -0400 Received: from a2i315.smtp2go.com ([103.47.205.59]:45189) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iJtQz-0006h4-73 for 37741@debbugs.gnu.org; Mon, 14 Oct 2019 02:02:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m9dnt0.a1-4.dyn; x=1571033841; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=lq0bXYRBJ1iDuMURubUpeSGcMutz1i257BS5A2F9bHI=; b=d9w0F6Rn UAfJC2ob3uugJM5TtU9dd+OjFGenE0vXVWOF9BtS+voj9APRSH3Ez1MFniNRDWIwviDRPLNzHoBHq irZJ1GQEcVWYhSpm0BlGviCbeXo9BTfpaSAcdJgvN4QTQ4nO6wl/fKyQJJzOMGi5Tkooh76Ty9mye R66+HD42P6e/e335chjUFGJV84ax1K+P84fAUrbn2/914FUgpQ0ycUaRrS5Dp6QJxIobzJ7KHjjYP KfkWJ0LTrMnaUX5KrTtnyt0KmbRqidAHXILop43LMhl1O/y3H3cappisWA5c9n+czavMD6qVHniuL i7bfpSJ4rZpbGrxExwC4+T2Khg==; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=palism.com; i=@palism.com; q=dns/txt; s=s437609; t=1571032941; h=from : subject : to : message-id : date; bh=lq0bXYRBJ1iDuMURubUpeSGcMutz1i257BS5A2F9bHI=; b=Kazjdw1om+bjCcYtov2EViJ5yffgB3PO26Hh7hrpZmaNlPiPnkbOJmTCq/9dfyC5DdcJwL WDhdNgIjoFGtCZAI52Iq99aD/mf3Rjom7g6ElbwqSUxmFktaMV001qE37e4kgTRxHIeC93Q7 AlPJnuF/5xnYbpXI/KsZY2b/QBy9sncRv6dGQ86gDzs8p3yoTjLLgL5TY9l2WFiEGJHLx3qP kilq8YiuxtF6SGAEczadwjgOvjQYxLW5T82CMrBV9kKYM8HWW/KLxM7ELj6TfQMgEXX0vCWR pqVGGSMu2np9IfnxSWRpH6lnyYTJUbRIw59T0sxljhtFD9W0hUjsP/Vg== Received: from [10.176.58.103] (helo=SmtpCorp) by smtpcorp.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92-S2G) (envelope-from ) id 1iJtQy-pH9QNB-P6; Mon, 14 Oct 2019 06:02:20 +0000 Received: from [10.71.224.214] (helo=palism.com) by smtpcorp.com with esmtpa (Exim 4.92-S2G) (envelope-from ) id 1iJtQx-9EFQWZ-HR; Mon, 14 Oct 2019 06:02:19 +0000 Received: from suleiman.europe (suleiman.panic [10.0.1.194]) by palism.com (Postfix) with ESMTPS id E82E23DB0A; Mon, 14 Oct 2019 02:02:18 -0400 (EDT) From: nomble@palism.com Date: Mon, 14 Oct 2019 02:01:53 -0400 Message-Id: <20191014060153.31198-1-nomble@palism.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191014001407.28367-1-nomble@palism.com> References: <20191014001407.28367-1-nomble@palism.com> MIME-Version: 1.0 X-Smtpcorp-Track: 1iJtQx9EFQWZHR.pD9qHe-sT Feedback-ID: 437609m:437609aw1iaFX:437609s1u6HOQKnx X-Report-Abuse: Please forward a copy of this message, including all headers, to X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-Mailman-Approved-At: Mon, 14 Oct 2019 08:20:33 -0400 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 From: Caliph Nomble * gnu/packages/bootloaders.scm (u-boot-rockpro64-rk3399): New exported variable. * gnu/bootloader/u-boot.scm (u-boot-rockpro64-rk3399-bootloader): New exported variable. (install-rockpro64-rk3399-u-boot): New variable. * gnu/system/install.scm (rockpro64-installation-os): New exported variable. Signed-off-by: Caliph Nomble --- gnu/bootloader/u-boot.scm | 17 +++++++++++++++++ gnu/packages/bootloaders.scm | 20 ++++++++++++++++++++ gnu/system/install.scm | 6 ++++++ 3 files changed, 43 insertions(+) diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index 54abfe1c69..4f98be2483 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -34,6 +34,7 @@ u-boot-pine64-plus-bootloader u-boot-pinebook-bootloader u-boot-puma-rk3399-bootloader + u-boot-rockpro64-rk3399-bootloader u-boot-wandboard-bootloader)) (define install-u-boot @@ -90,6 +91,15 @@ (write-file-on-device u-boot (stat:size (stat u-boot)) device (* 512 512))))) +(define install-rockpro64-rk3399-u-boot + #~(lambda (bootloader device mount-point) + (let ((idb (string-append bootloader "/libexec/idbloader.img")) + (u-boot (string-append bootloader "/libexec/u-boot.itb"))) + (write-file-on-device idb (stat:size (stat idb)) + device (* 64 512)) + (write-file-on-device u-boot (stat:size (stat u-boot)) + device (* 16384 512))))) + ;;; @@ -179,3 +189,10 @@ (inherit u-boot-bootloader) (package u-boot-puma-rk3399) (installer install-puma-rk3399-u-boot))) + +(define u-boot-rockpro64-rk3399-bootloader + ;; SD and eMMC use the same format + (bootloader + (inherit u-boot-bootloader) + (package u-boot-rockpro64-rk3399) + (installer install-rockpro64-rk3399-u-boot))) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 91f27d2e38..16cb72b46c 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -743,6 +743,26 @@ to Novena upstream, does not load u-boot.img from the first partition.") ("firmware-m0" ,rk3399-cortex-m0) ,@(package-native-inputs base)))))) +(define-public u-boot-rockpro64-rk3399 + (let ((base (make-u-boot-package "rockpro64-rk3399" "aarch64-linux-gnu"))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'set-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "BL31" (string-append (assoc-ref inputs "firmware") + "/bl31.elf")) + #t)) + ;; Phases do not succeed on the bl31 ELF. + (delete 'strip) + (delete 'validate-runpath))))) + (native-inputs + `(("firmware" ,arm-trusted-firmware-rk3399) + ,@(package-native-inputs base)))))) + (define-public vboot-utils (package (name "vboot-utils") diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 912096027f..eab3649269 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -62,6 +62,7 @@ novena-installation-os pine64-plus-installation-os pinebook-installation-os + rockpro64-installation-os rk3399-puma-installation-os wandboard-installation-os os-with-u-boot)) @@ -583,6 +584,11 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET." "/dev/mmcblk0" ; SD card storage "ttyS0")) +(define rockpro64-installation-os + (embedded-installation-os u-boot-rockpro64-rk3399-bootloader + "/dev/mmcblk0" ; SD card/eMMC (SD priority) storage + "ttyS2")) ; UART2 connected on the Pi2 bus + (define rk3399-puma-installation-os (embedded-installation-os u-boot-puma-rk3399-bootloader "/dev/mmcblk0" ; SD card storage