From patchwork Fri Dec 2 05:30:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45008 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 A94C227BBEC; Fri, 2 Dec 2022 05:32:31 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 43EF827BBE9 for ; Fri, 2 Dec 2022 05:32:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0yeb-0000Cy-14; Fri, 02 Dec 2022 00:32:05 -0500 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 1p0yeY-0000BX-IJ for guix-patches@gnu.org; Fri, 02 Dec 2022 00:32:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p0yeY-0004G9-9E for guix-patches@gnu.org; Fri, 02 Dec 2022 00:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p0yeY-0001bw-4d for guix-patches@gnu.org; Fri, 02 Dec 2022 00:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59761] [PATCH 1/2] gnu: make-u-boot-package: Add a u-boot argument. References: <20221202052903.10475-1-maxim.cournoyer@gmail.com> In-Reply-To: <20221202052903.10475-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 Dec 2022 05:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59761 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59761@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 59761-submit@debbugs.gnu.org id=B59761.16699590656169 (code B ref 59761); Fri, 02 Dec 2022 05:32:02 +0000 Received: (at 59761) by debbugs.gnu.org; 2 Dec 2022 05:31:05 +0000 Received: from localhost ([127.0.0.1]:44249 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p0ydc-0001bR-Up for submit@debbugs.gnu.org; Fri, 02 Dec 2022 00:31:05 -0500 Received: from mail-qv1-f42.google.com ([209.85.219.42]:36718) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p0yda-0001ag-Pi for 59761@debbugs.gnu.org; Fri, 02 Dec 2022 00:31:03 -0500 Received: by mail-qv1-f42.google.com with SMTP id o12so2828832qvn.3 for <59761@debbugs.gnu.org>; Thu, 01 Dec 2022 21:31:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=1dfdspZuYdUMjaTIAUn5aND4YoXvLSrGgAmsUXitrBs=; b=O1vvBs00N3lm1UJGYHIgHlVsvGiH0JiqwNfHUJ2ARZx0vwhUXJOb9k2Z8LXFyn3twA kYW4XAJ+43mUbla5+ODJJN8zlLiKmTDaE3y1E1ilS8q+dcN23rMe3Ffv8tZXqmxegDav xwZI0ijLLr6ATG+VGhg59cQoZT/u582rJk6H5Fw7WViLItlCHwf/jYh1Zt4m1SnbIgXb PkAY1wQI7dHWojsPgWfC9ffhDMmork1GxJsmc6inqh3IpA6h/Y+COXNEbSgYY9ngE1AX UzjeoUtGrZJ2YIinYoqySmO61/2ovwJ5U6YqVGhjPs+6M5zosoicSs792Ep8JwNISe8j GQ+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1dfdspZuYdUMjaTIAUn5aND4YoXvLSrGgAmsUXitrBs=; b=qHcM3WIIG1j+Evp3SSDLFFSQitJPR9KifNxo4sdoZoCX8kctDOoXL6qJLl4GEpMCkf T8OHFqEgj32a3USGnZXyHrWIB/awNhssQTIO4bAixzDm8V0fE9Vjby4hAT1P7Udr6dwD H9fWV6BtfO5dEm9eHkPMWfH/j3yOK2J3/DDHUchtaZcAp6Jrhn7eC5408GKgoEa53A2D q1FNofP+vttxdBEGGHQM8wdtu/7iQxzyAaRo9+GEkGvCsM/rKJgvYhFcFh8WNnOMdZyQ sIFDtNGKz5tIfwIeMGavW3dUBaGE6mtV1iNL6uqEkWfvnS5KI7EI9Gm3ORXYsk7HLgU8 yh4Q== X-Gm-Message-State: ANoB5pm5uoaqVCxKFpENkhe9tZQDZ0I27bamZgEYa5usNVybWLcXUg0t BlqCAI1gl5C8gA+THIQbwcBQbCRjoxg= X-Google-Smtp-Source: AA0mqf5tYb4qYLkSX8bCj0krCmd0EN/viUtMpiOwi/ZPmbnG+5ynWPxqdlI9i1dh206ostFtnJM7Cw== X-Received: by 2002:ad4:43eb:0:b0:4c6:90f0:cbe6 with SMTP id f11-20020ad443eb000000b004c690f0cbe6mr44711427qvu.116.1669959057077; Thu, 01 Dec 2022 21:30:57 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id o21-20020a05620a2a1500b006eeb3165554sm5019959qkp.19.2022.12.01.21.30.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 21:30:56 -0800 (PST) From: Maxim Cournoyer Date: Fri, 2 Dec 2022 00:30:51 -0500 Message-Id: <20221202053052.10563-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 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 And have that u-boot argument used as the complete base of the template, so that a user can override it. * gnu/packages/bootloaders.scm (make-u-boot-package): New U-BOOT argument. Document it. [native-inputs]: Move the native-inputs of U-BOOT first, so that the cross compilation tools can be overridden via U-BOOT. [arguments]: Rewrite using substitute-keyword-arguments, extending rather than overriding most arguments. Use gexps. --- gnu/packages/bootloaders.scm | 180 +++++++++++++++++++---------------- 1 file changed, 97 insertions(+), 83 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 8888c51736..7ec9bbb543 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2022 Denis 'GNUtoo' Carikli ;;; Copyright © 2021 Stefan +;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -782,11 +783,13 @@ (define*-public (make-u-boot-package board triplet defconfig configs name-suffix - append-description) + append-description + (u-boot u-boot)) "Return a U-Boot package for BOARD cross-compiled for TRIPLET with the optional DEFCONFIG file and optional configuration changes from CONFIGS. NAME-SUFFIX is appended to the package name, while APPEND-DESCRIPTION is -appended to the package description." +appended to the package description. U-BOOT can be used when a fork or a +different version of U-Boot must be used." (let ((same-arch? (lambda () (string=? (%current-system) (gnu-triplet->nix-system triplet))))) @@ -801,90 +804,101 @@ (define*-public (make-u-boot-package board triplet "\n\n" append-description) (package-description u-boot))) (native-inputs - `(,@(if (not (same-arch?)) + ;; Note: leave the native u-boot inputs first, so that a user can + ;; override the cross-gcc and cross-binutils packages. + `(,@(package-native-inputs u-boot) + ,@(if (not (same-arch?)) `(("cross-gcc" ,(cross-gcc triplet)) ("cross-binutils" ,(cross-binutils triplet))) - `()) - ,@(package-native-inputs u-boot))) + `()))) (arguments - `(#:modules ((ice-9 ftw) - (srfi srfi-1) - (guix build gnu-build-system) - (guix build kconfig) - (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build kconfig)) - #:test-target "test" - #:make-flags - (list "HOSTCC=gcc" - ,@(if (not (same-arch?)) - `((string-append "CROSS_COMPILE=" ,triplet "-")) - '())) - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs make-flags #:allow-other-keys) - (let* ((config-name (string-append ,board "_defconfig")) - (config-file (string-append "configs/" config-name)) - (defconfig ,defconfig) - (configs ',configs)) - (when defconfig - ;; Replace the board-specific defconfig with the given one. - (copy-file defconfig config-file)) - (if (file-exists? config-file) - (begin - (when configs - (modify-defconfig config-file configs)) - (apply invoke "make" `(,@make-flags ,config-name)) - (verify-config ".config" config-file)) - (begin - (display "invalid board name; valid board names are:" - (current-error-port)) - (let ((suffix-len (string-length "_defconfig")) - (entries (scandir "configs"))) - (for-each (lambda (file-name) - (when (string-suffix? "_defconfig" file-name) - (format (current-error-port) - "- ~A\n" - (string-drop-right file-name - suffix-len)))) - (sort entries string-ci<))) - (error "invalid boardname ~s" ,board)))))) - (add-after 'configure 'disable-tools-libcrypto - ;; Disable libcrypto due to GPL and OpenSSL license - ;; incompatibilities - (lambda _ - (substitute* ".config" - (("CONFIG_TOOLS_LIBCRYPTO=.*$") "CONFIG_TOOLS_LIBCRYPTO=n")))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (libexec (string-append out "/libexec")) - (uboot-files (append - (remove - ;; Those would not be reproducible - ;; because of the randomness used - ;; to produce them. - ;; It's expected that the user will - ;; use u-boot-tools to generate them - ;; instead. - (lambda (name) - (string-suffix? - "sunxi-spl-with-ecc.bin" - name)) - (find-files "." ".*\\.(bin|efi|img|spl|itb|dtb|rksd)$")) - (find-files "." "^(MLO|SPL)$")))) - (mkdir-p libexec) - (install-file ".config" libexec) - ;; Useful for "qemu -kernel". - (install-file "u-boot" libexec) - (for-each - (lambda (file) - (let ((target-file (string-append libexec "/" file))) - (mkdir-p (dirname target-file)) - (copy-file file target-file))) - uboot-files) - #t))))))))) + (substitute-keyword-arguments (package-arguments u-boot) + ((#:modules modules '()) + `((ice-9 ftw) + (srfi srfi-1) + (guix build gnu-build-system) + (guix build kconfig) + (guix build utils) + ,@modules)) + ((#:imported-modules imported-modules '()) + `((guix build kconfig) + ,@%gnu-build-system-modules + ,@imported-modules)) + ((#:test-target _ "test") + "test") + ((#:make-flags make-flags '()) + #~(list "HOSTCC=gcc" + #$@(if (not (same-arch?)) + (list (string-append "CROSS_COMPILE=" triplet "-")) + '()) + #$@make-flags)) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (replace 'configure + (lambda* (#:key outputs make-flags #:allow-other-keys) + (let* ((config-name (string-append #$board "_defconfig")) + (config-file (string-append "configs/" config-name)) + (defconfig #$defconfig) + (configs '#$configs)) + (when defconfig + ;; Replace the board-specific defconfig with the given + ;; one. + (copy-file defconfig config-file)) + (if (file-exists? config-file) + (begin + (when configs + (modify-defconfig config-file configs)) + (apply invoke "make" `(,@make-flags ,config-name)) + (verify-config ".config" config-file)) + (begin + (display "invalid board name; valid board names are:" + (current-error-port)) + (let ((suffix-len (string-length "_defconfig")) + (entries (scandir "configs"))) + (for-each (lambda (file-name) + (when (string-suffix? "_defconfig" + file-name) + (format (current-error-port) + "- ~A\n" + (string-drop-right + file-name suffix-len)))) + (sort entries string-ci<))) + (error "invalid boardname ~s" #$board)))))) + (add-after 'configure 'disable-tools-libcrypto + ;; Disable libcrypto due to GPL and OpenSSL license + ;; incompatibilities + (lambda _ + (substitute* ".config" + (("CONFIG_TOOLS_LIBCRYPTO=.*$") + "CONFIG_TOOLS_LIBCRYPTO=n")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((libexec (string-append #$output "/libexec")) + (uboot-files + (append + (remove + ;; Those would not be reproducible + ;; because of the randomness used to + ;; produce them. It's expected that the + ;; user will use u-boot-tools to generate + ;; them instead. + (lambda (name) + (string-suffix? + "sunxi-spl-with-ecc.bin" + name)) + (find-files "." + ".*\\.(bin|efi|img|spl|itb|dtb|rksd)$")) + (find-files "." "^(MLO|SPL)$")))) + (mkdir-p libexec) + (install-file ".config" libexec) + ;; Useful for "qemu -kernel". + (install-file "u-boot" libexec) + (for-each + (lambda (file) + (let ((target-file (string-append libexec "/" file))) + (mkdir-p (dirname target-file)) + (copy-file file target-file))) + uboot-files))))))))))) (define-public u-boot-malta (make-u-boot-package "malta" "mips64el-linux-gnuabi64")) From patchwork Fri Dec 2 05:30:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45007 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 EA61927BBEB; Fri, 2 Dec 2022 05:32:24 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable 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 7BD7927BBE9 for ; Fri, 2 Dec 2022 05:32:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0yeZ-0000CC-Ou; Fri, 02 Dec 2022 00:32:03 -0500 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 1p0yeY-0000Bg-Ti for guix-patches@gnu.org; Fri, 02 Dec 2022 00:32:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p0yeY-0004GK-LU for guix-patches@gnu.org; Fri, 02 Dec 2022 00:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p0yeY-0001c3-Hg for guix-patches@gnu.org; Fri, 02 Dec 2022 00:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59761] [PATCH 2/2] gnu: Add u-boot-ts7970-q-2g-1000mhz-c. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 Dec 2022 05:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59761 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59761@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 59761-submit@debbugs.gnu.org id=B59761.16699590736182 (code B ref 59761); Fri, 02 Dec 2022 05:32:02 +0000 Received: (at 59761) by debbugs.gnu.org; 2 Dec 2022 05:31:13 +0000 Received: from localhost ([127.0.0.1]:44252 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p0ydk-0001be-La for submit@debbugs.gnu.org; Fri, 02 Dec 2022 00:31:13 -0500 Received: from mail-qv1-f53.google.com ([209.85.219.53]:46012) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p0ydj-0001bY-4X for 59761@debbugs.gnu.org; Fri, 02 Dec 2022 00:31:11 -0500 Received: by mail-qv1-f53.google.com with SMTP id d2so2800083qvp.12 for <59761@debbugs.gnu.org>; Thu, 01 Dec 2022 21:31:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zyolDtQyxm5kC9UywO92iybrIpGFWTpDOImtQN5eskc=; b=ZBHOJ5uwcO+1LYlGeO0d29MAKpbOe49O3aH8efpF45hpuegrg3tDICvAmpCY1NAQiH hW/doQz2hu38l2wHOQYRYcKkrzmcaV75Lgtrde3LyaRShRLHIySQlSENK6xp7BHIxW9U WKQNBRctjDkRGzU/XgyVuOF4BwFtTy4UAWe64A9agyDRXMpycoOCSwAMoufjJV8sz1fg JwdCc1E3XkZ0rgc0M6tLhL5vmAtVu6HiZhTc8dSO7vTXaaoVxH4ZNv/8Wan6GTHzbdXL Qz388oii5U4y9eoPhIfjvhSQXRWpipAjMkCPg+GV0x/ngoeTWF0DRKTsbZQ7bVtW/O/y YQ8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zyolDtQyxm5kC9UywO92iybrIpGFWTpDOImtQN5eskc=; b=DtcSjnT1qQ+2A906xye1PJ7doadRu+ebyOhFjzuPgzdB8F+RmItkyNiz8FqDYYPiEc ebLxz+MAlzv4ZCcGF7zkSOVkYJnFg80vqfm0eg/hVkdjzNJCMa9vj5BSnRH4W/K7iHFo KQByCPTCj2zgaovUG2xEKZ0PQ1fugAR2y4iaTo+FG7b9LmWub+RCjIhw4a+sZ438E+Gm iuXmIN8TNlplAXVOPFLMmkAXhyaBbbR5LBuw68PJavp5R6AO2CLuTWROXQem02yeQvrR umAXox/iRxZqIHN32CHl90zvKfCs2dt0azHjcFdVpLh+WE+3UTUYqJNtxXREVUWgEgRX z5lw== X-Gm-Message-State: ANoB5pnFP/R64f55YOdNN6a1FZ67zCJlzQHrrGr6eMqL3ioNx2ZouvgJ I6OOauUv/QwlFNFpQ63BmxsFuYdlwgA= X-Google-Smtp-Source: AA0mqf641WO2ptpo748AZui8Zd2fTf47nuoLd+chrLw3PWxCiWWzrdiSEebb6IPfaA3WijFhRU16Kw== X-Received: by 2002:a05:6214:3002:b0:4c7:14b:18a3 with SMTP id ke2-20020a056214300200b004c7014b18a3mr20957581qvb.41.1669959065587; Thu, 01 Dec 2022 21:31:05 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id o21-20020a05620a2a1500b006eeb3165554sm5019959qkp.19.2022.12.01.21.31.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 21:31:05 -0800 (PST) From: Maxim Cournoyer Date: Fri, 2 Dec 2022 00:30:52 -0500 Message-Id: <20221202053052.10563-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221202053052.10563-1-maxim.cournoyer@gmail.com> References: <20221202053052.10563-1-maxim.cournoyer@gmail.com> 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 * gnu/packages/bootloaders.scm (u-boot-ts-mx6): New variable. (u-boot-ts7970-q-2g-1000mhz-c): Likewise. --- gnu/packages/bootloaders.scm | 58 ++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 7ec9bbb543..ed3dace87d 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1271,6 +1271,64 @@ (define-public u-boot-rpi-4-32b-efi-bin (define-public u-boot-rpi-arm64-efi-bin (make-u-boot-bin-package u-boot-rpi-arm64-efi)) +(define u-boot-ts-mx6 + ;; There is no release; use the latest commit of the + ;; 'imx_v2015.04_3.14.52_1.1.0_ga' branch. + (let ((revision "0") + (commit "344403c64d93813fce8c6d94ed4c3ffb1fe2a181")) + (package + (inherit u-boot) + (name "u-boot-ts-mx6") + (version (git-version "2015.04_3" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/embeddedTS/u-boot-imx") + (commit commit))) + (file-name (git-file-name "u-boot-imx-ts" version)) + (sha256 + (base32 + "081swfz204dsy0nss4r55b8453w766yp2wgrh5y10l3gjc0fkrs1")))) + (arguments + (substitute-keyword-arguments (package-arguments u-boot) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (add-after 'unpack 'patch-for-reproducibility + (lambda _ + ;; Substitute dynamically computed timestamps with static + ;; ones. + (substitute* "Makefile" + (("U_BOOT_DATE \"%b %d %C%y\"") + "U_BOOT_DATE \"Jan 01 1969\"") + (("U_BOOT_TIME \"%T\"") + "U_BOOT_TIME \"00:00:00\"")))) + (add-before 'build 'adjust-for-gcc10 + (lambda _ + (invoke "gcc" "--version") + (copy-file "include/linux/compiler-gcc6.h" + "include/linux/compiler-gcc10.h") + (substitute* "arch/arm/Makefile" + (("march=armv5") + "march=armv5te")))) + (add-after 'install 'build+install-tools + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "tools-all" make-flags) + (invoke "find") + (install-file "tools/env/fw_printenv" + (string-append #$output "/bin")) + (symlink (string-append #$output "/bin/fw_printenv") + (string-append #$output "/bin/fw_setenv")))))))) + (native-inputs + (modify-inputs (package-native-inputs u-boot) + (delete "dtc")))))) ;otherwise the build fails + +(define-public u-boot-ts7970-q-2g-1000mhz-c + (make-u-boot-package "ts7970-q-2g-1000mhz-c" "arm-linux-gnueabihf" + #:u-boot u-boot-ts-mx6 + #:append-description "This U-Boot variant is for the +Technologic System TS-7970 revision C board, which includes a quad core +Freescale i.MX6 CPU and 2 GiB of RAM clocked at 1000MHz.")) + (define-public vboot-utils (package (name "vboot-utils")