From patchwork Wed Feb 6 22:35:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 967 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 0AFFF16BCC; Wed, 6 Feb 2019 22:42:07 +0000 (GMT) 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 autolearn=ham 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 B81F916BC8 for ; Wed, 6 Feb 2019 22:42:06 +0000 (GMT) Received: from localhost ([127.0.0.1]:59498 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grVtO-0002SV-8t for patchwork@mira.cbaines.net; Wed, 06 Feb 2019 17:42:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grVtL-0002Qt-Bu for guix-patches@gnu.org; Wed, 06 Feb 2019 17:42:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grVtK-0004Pz-JW for guix-patches@gnu.org; Wed, 06 Feb 2019 17:42:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37038) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grVtK-0004Pt-Gg for guix-patches@gnu.org; Wed, 06 Feb 2019 17:42:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1grVtK-0002GH-8W for guix-patches@gnu.org; Wed, 06 Feb 2019 17:42:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34356] [PATCH] gnu: u-boot-novena: Allow booting from raw device offset. Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Feb 2019 22:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34356 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34356@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15494928678604 (code B ref -1); Wed, 06 Feb 2019 22:42:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Feb 2019 22:41:07 +0000 Received: from localhost ([127.0.0.1]:36316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1grVsQ-0002Ei-R2 for submit@debbugs.gnu.org; Wed, 06 Feb 2019 17:41:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56307) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1grVsO-0002E6-Jq for submit@debbugs.gnu.org; Wed, 06 Feb 2019 17:41:05 -0500 Received: from lists.gnu.org ([209.51.188.17]:51001) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1grVsJ-00044t-6G for submit@debbugs.gnu.org; Wed, 06 Feb 2019 17:40:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42409) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grVsI-0001cs-7x for guix-patches@gnu.org; Wed, 06 Feb 2019 17:40:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grVnZ-0002Uc-Jj for guix-patches@gnu.org; Wed, 06 Feb 2019 17:36:07 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:50084) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grVnX-0002U9-J4 for guix-patches@gnu.org; Wed, 06 Feb 2019 17:36:03 -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 524611AAC0 for ; Wed, 6 Feb 2019 14:36:00 -0800 (PST) From: Vagrant Cascadian Date: Wed, 06 Feb 2019 14:35:54 -0800 Message-ID: <87y36s1r5h.fsf@ponder> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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-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 * gnu/packages/bootloaders.scm (u-boot-novena): Disable loading u-boot.img from FAT partition. --- gnu/packages/bootloaders.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 5bd784f73c..40b14fcce8 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -624,7 +624,20 @@ board-independent tools."))) (make-u-boot-package "mx6cuboxi" "arm-linux-gnueabihf")) (define-public u-boot-novena - (make-u-boot-package "novena" "arm-linux-gnueabihf")) + (let ((base (make-u-boot-package "novena" "arm-linux-gnueabihf"))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'patch-novena-defconfig + ;; Patch configuration to disable loading u-boot.img from FAT partition, + ;; allowing it to be installed at a device offset. + (lambda _ + (substitute* "configs/novena_defconfig" + (("CONFIG_SPL_FAT_SUPPORT=y") "# CONFIG_SPL_FAT_SUPPORT is not set")) + #t))))))))) (define-public u-boot-cubieboard (make-u-boot-package "Cubieboard" "arm-linux-gnueabihf"))