From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 02 00:29:12 2022 Received: (at submit) by debbugs.gnu.org; 2 Dec 2022 05:29:12 +0000 Received: from localhost ([127.0.0.1]:44231 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p0ybo-0007ha-3e for submit@debbugs.gnu.org; Fri, 02 Dec 2022 00:29:12 -0500 Received: from lists.gnu.org ([209.51.188.17]:42774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p0ybm-0007hU-Fi for submit@debbugs.gnu.org; Fri, 02 Dec 2022 00:29:11 -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 1p0ybm-0008Cz-Al for guix-patches@gnu.org; Fri, 02 Dec 2022 00:29:10 -0500 Received: from mail-qt1-x836.google.com ([2607:f8b0:4864:20::836]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p0ybk-0002xW-Tj for guix-patches@gnu.org; Fri, 02 Dec 2022 00:29:10 -0500 Received: by mail-qt1-x836.google.com with SMTP id fz10so3855490qtb.3 for ; Thu, 01 Dec 2022 21:29:08 -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=aK/YfvCs9O+CUeC1wasrqmxpRoPrWPlvScW0jLzT8zw=; b=SCZEW2KelyHUoTVRHfit70bjYF26cY9JyziDrbE07wZTV30I6/Wi/g089H3anRdcYx N8p/oPk1kiXEHirReFF1qpXDkxHZqbat8r/LBVPMepraHlfjqBs7P/iVfv1UrLX92G7o rnQAfSkN2CPjkZacOOXUBaNgtJ2JYGZa35FDdKPmHBlC9cZYdyOCOdERza5AGz3zyhYe nay6bc9z8IV4FiUTMxeS0GsC+P10i6yVqaRuVQOZjBrjzTUNl1WYTcGeLiPtktcQugZl 4F9yxNlGwihdFZ3CuqTc4tZL1Kqdt4+kaUqkQd6TNh0GE+1dPP8yGklW/o793QAnJij7 BHwg== 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=aK/YfvCs9O+CUeC1wasrqmxpRoPrWPlvScW0jLzT8zw=; b=pEUjMq6I9FHn3XLy3HZk9qLQdSyYILL65SvfkM1nQuj1lj6aD8nofPXB+PaGtFMwuc 3k1lFnz1cSgdKBo7XXeEAe5cNHC2bCCAMFyPVW0jyFWKFmiZp2IC81MfVDd5fTaVjN7Y Dw3B6w739ko+POcxKaXakbvgv8nQfubauApyyz+xbExgDmPOS9VpkkHnKQCPdagr2sAw HstFCbs3e9bNdbueTKWT3LMMHQAccsbytxLkgXzs22q55CnU7nrSswwxff7FT+/Jqf62 +CST28V7yOVpKQBBNQLzGKcA2euIWFAnrFqMkb0WL29qp+vgooVDbbv9Swc7aYww78QU SUjA== X-Gm-Message-State: ANoB5pkeacsbKmrPr8/yZNzWTjIPP7LaWmQ3PbfGh/QsJgDNVsCUDXae 4q2+nfZNER/PxYsAiB8+tVf/Er7drXk= X-Google-Smtp-Source: AA0mqf6ReNi648mg1aTWH8Af28thE388Pjpes2ynP3TRmVPEKkxIsAxeRJDxTSDpW891hU2knD7/2g== X-Received: by 2002:a05:622a:1e94:b0:3a5:1ab8:4250 with SMTP id bz20-20020a05622a1e9400b003a51ab84250mr50708339qtb.182.1669958947439; Thu, 01 Dec 2022 21:29:07 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id x16-20020ac87a90000000b003a5fb681ae7sm3670168qtr.3.2022.12.01.21.29.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 21:29:07 -0800 (PST) From: Maxim Cournoyer To: guix-patches@gnu.org Subject: [PATCH 0/2] Add u-boot-ts7970-q-2g-1000mhz-c. Date: Fri, 2 Dec 2022 00:29:03 -0500 Message-Id: <20221202052903.10475-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::836; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qt1-x836.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hello! This makes our make-u-boot-package procedure more flexible, and builds on it to add a new U-Boot bootloader package for an i.MX6 embedded board. Thanks, Maxim Cournoyer (2): gnu: make-u-boot-package: Add a u-boot argument. gnu: Add u-boot-ts7970-q-2g-1000mhz-c. gnu/packages/bootloaders.scm | 238 +++++++++++++++++++++++------------ 1 file changed, 155 insertions(+), 83 deletions(-) base-commit: 4781f0458de7419606b71bdf0fe56bca83ace910 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 02 00:31:05 2022 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 To: 59761@debbugs.gnu.org Subject: [PATCH 1/2] gnu: make-u-boot-package: Add a u-boot argument. 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59761 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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")) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 02 00:31:13 2022 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 To: 59761@debbugs.gnu.org Subject: [PATCH 2/2] gnu: Add u-boot-ts7970-q-2g-1000mhz-c. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59761 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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") -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 07 10:02:15 2022 Received: (at 59761) by debbugs.gnu.org; 7 Dec 2022 15:02:15 +0000 Received: from localhost ([127.0.0.1]:50587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2vw7-0001lC-8O for submit@debbugs.gnu.org; Wed, 07 Dec 2022 10:02:15 -0500 Received: from mail-qt1-f171.google.com ([209.85.160.171]:42992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2vw4-0001l4-FD for 59761@debbugs.gnu.org; Wed, 07 Dec 2022 10:02:13 -0500 Received: by mail-qt1-f171.google.com with SMTP id h24so16299064qta.9 for <59761@debbugs.gnu.org>; Wed, 07 Dec 2022 07:02:12 -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=qjqPNM4unpNt6JOAxjWlTzqLqvKr2KDjWqk/kLtaiVQ=; b=hrm7wtJFMlXV2IAA7tatTxwXYakqwI4gDBKNgDpDi0Dp5rULG3cX3540GJrHcmTDuP 8ErSkVolycbHxTs8hPDh293LDXaT1VWEmbPYU7wkgF1nv1iaWVAxDiMNO/yaB6nASl/j LuI/1helAEpk+ErXbW5749GA1F6x+thfvg6l6scBYNFtIrdd97x3qAUoPNG9e6Tt7rJG kpRnChm6aA+AWBwFa0zTjEsyEBHtBgKMXcNprBZI63jQ3TVXugDSXKYprFRor/kWnMSh S/ZAN9q6Gmc8gpiz1pX45lRRPcGDmzGlBy5qC9vqf+Yv2dZI4h3itvEIlsR1DxPSi6qN QxCQ== 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=qjqPNM4unpNt6JOAxjWlTzqLqvKr2KDjWqk/kLtaiVQ=; b=aE9UoTBBGHZRK394KcXq31wvPlfaajMg6UnBffzam14/qU3ewt0WLEILotBUNrfrFo nVAND2jefrBbx3IsBLL5rGKzGIyMdRL4dLG9inWw+ICxu3jmhAepUndJtqoVEsrAOxRa /eGLLhLlRZYRkiwb5T45CNu8sitVRJ0qSvw2i7dpxFOorwFS5XlOT0O/NmcM5BrYIjOn vH7L39HhD8w4+4lTudiSS6mBdPpECEM13LcKSe75XarBjkTIsI6RVocB5bDq83EE1Z+m wjFgHdDa93Gm571V0BXANnNIHY1ehovka/Z/yeuziwezVBL2NqMcM1aXVCFLv5KSsX7W 0QBg== X-Gm-Message-State: ANoB5pnvG7ut9XSLa8QcE/u0+w8moDHZIssJqHYH1wLE98r9KzZqHavw nIZMPcCCVPiVuMiiRsQIG4OnsNBNA8g= X-Google-Smtp-Source: AA0mqf5jB4dO7NZNBoxNqDMeDwIbtDhvoub9HTfbgVDs1Idk7AjUvclMLeNDHK6PkB424OR2Um5irQ== X-Received: by 2002:a05:622a:58b:b0:3a5:c8c6:a889 with SMTP id c11-20020a05622a058b00b003a5c8c6a889mr1765270qtb.22.1670425326395; Wed, 07 Dec 2022 07:02:06 -0800 (PST) Received: from localhost.localdomain (dsl-205-233-124-140.b2b2c.ca. [205.233.124.140]) by smtp.gmail.com with ESMTPSA id a7-20020ac84d87000000b003a6a19ee4f0sm9372462qtw.33.2022.12.07.07.02.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 07:02:06 -0800 (PST) From: Maxim Cournoyer To: 59761@debbugs.gnu.org Subject: [PATCH v2 1/3] gnu: make-u-boot-package: Add a u-boot argument. Date: Wed, 7 Dec 2022 10:01:59 -0500 Message-Id: <20221207150201.9383-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59761 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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")) base-commit: d4c2ea9226c229e56022ba641100ee7f5db8f53f -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 07 10:02:20 2022 Received: (at 59761) by debbugs.gnu.org; 7 Dec 2022 15:02:20 +0000 Received: from localhost ([127.0.0.1]:50590 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2vwB-0001lP-WA for submit@debbugs.gnu.org; Wed, 07 Dec 2022 10:02:20 -0500 Received: from mail-qt1-f173.google.com ([209.85.160.173]:39462) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2vw9-0001l6-U4 for 59761@debbugs.gnu.org; Wed, 07 Dec 2022 10:02:18 -0500 Received: by mail-qt1-f173.google.com with SMTP id r7so3688176qtx.6 for <59761@debbugs.gnu.org>; Wed, 07 Dec 2022 07:02:17 -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=XZqXVfTzn5YRnOeFCio1oq27IwTOUyMmow397x5rFz8=; b=B5PC8AhugaP3TiM0QrV3Ch6E+b+xthbo7zwLPgZhtieliR5LALbjyJIEvGHTjnuge8 avO1gbjdA1LNtKoQunciFTPqZzrB+k0sY4JGoGX+lnbEASNyrgb2PIZ7oydIdBRHk+Rt IxP8/uw+PoSNBLVzYzzMDsTgrEtcYY92mkRSbdeck0ivah9zyBESv4C1kIIom95ebQXj 0ecVB0NJtFtctKSn7DAVbsThOXfgCLBEv7P73QHxGi6pE9UQr2Y+hCoAcjxXVWsN3Cyz CYxhrwjfEQxBoqGgaDvYr7Tt/6arLi5hIZqiTC8eTXu0c89r3VT8Ujqtgn6lMt8KVPgB 5mww== 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=XZqXVfTzn5YRnOeFCio1oq27IwTOUyMmow397x5rFz8=; b=dkFNCY1mNB3Vtih//c7ZxDb7wyd2jyDvipoHQ0Ef1NbtJ+juYFB/ZFc5+nvUhyGlcy lH/lZWmE5SsN6oAkunmyPaakkPj+SHGL8LkmgAFtZK0W56MXKd8dZJeWZHGtEW4ME4Mq DUh6C8Gqy1639zHD6bxh994O3ds0RmBnGAKIjUPZ2IbKT31S585Cwoqhe/n4QJicbHse jS5UDsc/cjCYxroND3WppxxJ0Ymt5qzAE0KBx+ecnz+oAyxyQiVywEoX25rfjILCHebN kZ4i9o6v6xEkuUcoC5QSPAlAZGqNSEGZFnMTV6a4g1DsdwYZlns4O12zQVcdWUnpOSds ijNQ== X-Gm-Message-State: ANoB5pmqJIkaOS+ddv6H0gZOa/Q1Ha7dNz+FG8M8foHkMiojQtxIRVzi WlbSlyrzUspx6VScG+1Qfu4tL0j0Mlg= X-Google-Smtp-Source: AA0mqf54BtvIo4TCs7C+khCMcYFJgZcVlfrGWUiCuZqK0uzvldsIsGc4JXricJaWOptgkEdRD1vNRQ== X-Received: by 2002:a05:622a:4d96:b0:3a5:24fc:4bbb with SMTP id ff22-20020a05622a4d9600b003a524fc4bbbmr1174382qtb.7.1670425331873; Wed, 07 Dec 2022 07:02:11 -0800 (PST) Received: from localhost.localdomain (dsl-205-233-124-140.b2b2c.ca. [205.233.124.140]) by smtp.gmail.com with ESMTPSA id a7-20020ac84d87000000b003a6a19ee4f0sm9372462qtw.33.2022.12.07.07.02.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 07:02:11 -0800 (PST) From: Maxim Cournoyer To: 59761@debbugs.gnu.org Subject: [PATCH v2 2/3] gnu: make-u-boot-package: Install .imx files. Date: Wed, 7 Dec 2022 10:02:00 -0500 Message-Id: <20221207150201.9383-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221207150201.9383-1-maxim.cournoyer@gmail.com> References: <20221207150201.9383-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59761 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (make-u-boot-package) [phases] : Add imx to the regexp of files considered for installation. --- gnu/packages/bootloaders.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 7ec9bbb543..ab2cf06fd5 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -887,7 +887,7 @@ (define*-public (make-u-boot-package board triplet "sunxi-spl-with-ecc.bin" name)) (find-files "." - ".*\\.(bin|efi|img|spl|itb|dtb|rksd)$")) + ".*\\.(bin|efi|img|imx|spl|itb|dtb|rksd)$")) (find-files "." "^(MLO|SPL)$")))) (mkdir-p libexec) (install-file ".config" libexec) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 07 10:02:26 2022 Received: (at 59761) by debbugs.gnu.org; 7 Dec 2022 15:02:26 +0000 Received: from localhost ([127.0.0.1]:50594 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2vwI-0001lb-91 for submit@debbugs.gnu.org; Wed, 07 Dec 2022 10:02:26 -0500 Received: from mail-qt1-f169.google.com ([209.85.160.169]:36614) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2vwF-0001lO-Vo for 59761@debbugs.gnu.org; Wed, 07 Dec 2022 10:02:24 -0500 Received: by mail-qt1-f169.google.com with SMTP id fz10so16347748qtb.3 for <59761@debbugs.gnu.org>; Wed, 07 Dec 2022 07:02:23 -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=p5wI9ih4sGG7tmAaT8DEMAQkQJd9051SfheVeAZ+kbA=; b=KR5rV1Rm+SRN1AlbYJTivvsP4MoCx32vv21+Qc7G1ZJZRQQsRy1Kf8xyT0OW86/Dej jfIDyKN6GrDSnQXCTtaCiPznqf0ABYDxLTQO0bv+f7/o5SrsH75Tfsg+cI0RF5+KgG7d qnF3V0uct+8jfnGxlNg7V9lsR6ej63fMipam+kYBAZ9aqzzYOuFDQBU12JgHBPJm71Me hLyJS6HX14H3l3zzVR9YOnWCWkGtSlo4rb6I37pP3PEuGtUiBgCbmYQxskdWBeC94yvi 92V7VAQpR6vC8lskNSOVR1QPxkK0QMiBkF6PTbzco5Flwy8KkDJj0LhHGsy8QGC28PVO vOHw== 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=p5wI9ih4sGG7tmAaT8DEMAQkQJd9051SfheVeAZ+kbA=; b=wFifYj3Kv0M3FNSr/66h6Nw3kdf/WzE/nVGxurzhm+KnzPYzz1UqcnJuFzGU1BGkjF qDS46kJyRQJIAgaKlJzmaYxGlY6T55QhXjyay0Tb5NAkq80xUyAH/JCh2pP5q3FZIiKJ wP54cBWkAh2/LUtJGo5RyYPzLC6jVlgsAZjQHcQq8DeoQP1oGG/+CSdhYhvpogTPdDV8 ELpKYRBv8kBzRJtfPq6jti1MMUS1rBe0tLh/TM5CwLXLLB/6shJ1KVM3VmetM+Ca5m72 rfdIwzwnEGbkZ/1/il1H+j91COsDFbXYS3sMVLk96q70ANpwcIAs0bNlZSRFDh77GS4V jDXw== X-Gm-Message-State: ANoB5pm+nZaLPrPdvxEIeGIjH359RXYB/NU0A9ucH7LitmVucwD96yiz BVihM+kIj//VFxAWC0zrQvPQ7V1nG7U= X-Google-Smtp-Source: AA0mqf5whxXFDPwJ55G6k1ILLGbnPWYUKtE4A4lvDTRhHRofGXZxJWMFSHbQhN3AOSrlBrDNiRQizA== X-Received: by 2002:a05:622a:5c9b:b0:3a6:77f5:10da with SMTP id ge27-20020a05622a5c9b00b003a677f510damr1366577qtb.42.1670425337872; Wed, 07 Dec 2022 07:02:17 -0800 (PST) Received: from localhost.localdomain (dsl-205-233-124-140.b2b2c.ca. [205.233.124.140]) by smtp.gmail.com with ESMTPSA id a7-20020ac84d87000000b003a6a19ee4f0sm9372462qtw.33.2022.12.07.07.02.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 07:02:17 -0800 (PST) From: Maxim Cournoyer To: 59761@debbugs.gnu.org Subject: [PATCH v2 3/3] gnu: Add u-boot-ts7970-q-2g-1000mhz-c. Date: Wed, 7 Dec 2022 10:02:01 -0500 Message-Id: <20221207150201.9383-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221207150201.9383-1-maxim.cournoyer@gmail.com> References: <20221207150201.9383-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59761 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (u-boot-ts-mx6): New variable. (u-boot-ts7970-q-2g-1000mhz-c): Likewise. --- gnu/packages/bootloaders.scm | 59 ++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index ab2cf06fd5..28a85eeca5 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1271,6 +1271,65 @@ (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) + (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 Systems +TS-7970 revision C board, which includes a quad core Freescale i.MX6 CPU and 2 +GiB of RAM clocked at 1000MHz. The binary U-Boot image to flash is the +@file{libexec/u-boot.imx} file.")) + (define-public vboot-utils (package (name "vboot-utils") -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 13 21:32:49 2022 Received: (at 59761) by debbugs.gnu.org; 14 Dec 2022 02:32:49 +0000 Received: from localhost ([127.0.0.1]:36083 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5HZg-0000XO-S1 for submit@debbugs.gnu.org; Tue, 13 Dec 2022 21:32:49 -0500 Received: from mail-qv1-f45.google.com ([209.85.219.45]:36591) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5HZe-0000XG-Cl for 59761@debbugs.gnu.org; Tue, 13 Dec 2022 21:32:47 -0500 Received: by mail-qv1-f45.google.com with SMTP id o12so11704887qvn.3 for <59761@debbugs.gnu.org>; Tue, 13 Dec 2022 18:32:46 -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=zrI7rxcEpuhWCZphGgSxrEJ/JD7w9u9yMT5MEzKYawo=; b=Mkv9YcWVSReCp0CocVgvsY8fJiSbj36N7X+YVHnHXGAhkYEkIKBLk+kkqBulUzR5f0 i8wtUPYHfdxC6HCwjxFK1GSqxEq0q3G+hWHwaMEtarlUkMWo9weawigI6q1E1cYab5aV JnVQa9ipqQwTAhV1jbIn9ZKQIaKgaMSM1FYvIffE1pnnShGx3wXpeg2YMbsVIatU299h UOERA8Mux5b+G3ibhE1kDSrrS4eVeF9jVMnoCMazMC1c34qnpWk+XML/fgK/3++BMys6 m7FqpcPFWRTX/aoqg4+3C8UvXJt70OONi/VYdBNvUGbFMLCsESpF2NlNc0BwXfTLVM2a dozg== 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=zrI7rxcEpuhWCZphGgSxrEJ/JD7w9u9yMT5MEzKYawo=; b=57ywYaPwnWFCeRdOt+L0B8Sun9mw/BC5Jr+WZhWr7RU79A9pzndCB9DRWrTXewjtxh oHvy8J8tW2ss2KU9wqfWGSU8xyotITX1UpDXMqKgJ/joruZr4J0DzmV8vTXboHsRMJA6 KrK1YcjF3Yrjdxwz1RKQ/wrEk37loa4AWo6VtqHAv700YitFyrRHWbTUNPtdS+6YfdhK 8TAQQZogcCDRNumY1AELd0Cjzj+I/jzHzdiHr8v7Yg/vzZfcnMqTV86p7fVSPr1H1vbJ IJRZMck5+fPjOYdQJ31RSGLox36TOGX3C4Br4Y/17T6+OAzbOTZeFVmPEsEKlDvsZIko u9Ww== X-Gm-Message-State: ANoB5pnLEbPfIT1HOj4P0V3WBqwfyyNr0Yfey2MtdfDNeB5uflvr6qJM TJFUH6YYeTJQtef/kDtrpOG4zcP6qsrDdA== X-Google-Smtp-Source: AA0mqf4fUFdb2GMGqPIcZAQ5muHbR09oW+OkrMACT8y4fZjwvrhDwPAYrkpxKKRA+bEVS2hznsGXgw== X-Received: by 2002:ad4:5109:0:b0:4c7:26a4:908e with SMTP id g9-20020ad45109000000b004c726a4908emr30603212qvp.47.1670985160210; Tue, 13 Dec 2022 18:32:40 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1006]) by smtp.gmail.com with ESMTPSA id k12-20020a05620a414c00b006e42a8e9f9bsm9191306qko.121.2022.12.13.18.32.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Dec 2022 18:32:39 -0800 (PST) From: Maxim Cournoyer To: 59761@debbugs.gnu.org Subject: [PATCH v3 1/4] gnu: make-u-boot-package: Add a u-boot argument. Date: Tue, 13 Dec 2022 21:32:33 -0500 Message-Id: <20221214023236.25345-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59761 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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")) base-commit: 0ffa501f2b3e83ae56e9c2bd31418439090e869a -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 13 21:32:51 2022 Received: (at 59761) by debbugs.gnu.org; 14 Dec 2022 02:32:51 +0000 Received: from localhost ([127.0.0.1]:36086 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5HZi-0000Xf-Ok for submit@debbugs.gnu.org; Tue, 13 Dec 2022 21:32:51 -0500 Received: from mail-qv1-f45.google.com ([209.85.219.45]:36591) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5HZg-0000XG-PT for 59761@debbugs.gnu.org; Tue, 13 Dec 2022 21:32:49 -0500 Received: by mail-qv1-f45.google.com with SMTP id o12so11705045qvn.3 for <59761@debbugs.gnu.org>; Tue, 13 Dec 2022 18:32:48 -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=Q5ft5quI9k56qDAM4eOgAltx2IUVB8HGULtJygVIUnY=; b=qwW8sxaIDEMP5G7bkYQW980AlVBpgUPA9x2ieCGMgmd2DSxaE+0iz2h4wCplOw4m3z yWeXvDND4UwqAneVVdqnPWsiTkRIG/W/Gq/CZRJ6boYkhkhBS3he5MW7a4M0cx4WYNSy dEN8QI/MBadzrsBx4uQu23MvynmBcM7dd5WSTNlKBFbBvAwwvfX8Fz9jBaqAAlDNXEpT wrx8xzP1nqIESEA2KS/tW+0fLvajwcmQzXzXXyshsSWtFek4rUxVgOg/nNeXpPlxSTFC NLJ4PeC5QQGeVcQLJdCxQ+lSvlDslWUtfBy22SNK9jZnkT1q6x6ZCVxW3cKgpeGOLdYp HOSg== 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=Q5ft5quI9k56qDAM4eOgAltx2IUVB8HGULtJygVIUnY=; b=E2TcctVsDLynFRyJWw3nH1WGAKfa2UCNxi6CykK7EdcgGr4IFv0tW1wk9X3kAJFZee n5SC5TMnVkHYE5Zl/w4F6cAVXBcSBUnJughCIJNUVMf3jLUwdpALx/3TjVgJyimxoOSv pdghHwJzRL8b1teWv2H9NP3U/GuQVUb9zz1Q054pPjH7sg0HOf/VprFHuq3YkogbfKPU aUkVEGoYpgP5RQARlHbcYeex+pYLvxmoTscrBjRADa3iBa2VyVe6cOXKdyDJ8aeERdQH DQUF6oJc68ZaTU0ZWYTyyQ+KFxNXBlvJaOP/ov1MQlAqJAf0845WAmjuU3HZJIFNquUX +MJg== X-Gm-Message-State: ANoB5pnRh821lIhE9qnlJ4k/+ft249VzYAVLSHmAdmdGw35PCyOqjfDJ NMRqiDa2clUXzmwilRFHgR689tcbhDwNhw== X-Google-Smtp-Source: AA0mqf5+oRYx+xwoPhZ1JhvGziEU5WT+TOKGZ8KCUpsSvThtSoHsSt125RrgACdZlYlbwoU8I8g9kQ== X-Received: by 2002:a0c:fac2:0:b0:4c7:3cb0:4584 with SMTP id p2-20020a0cfac2000000b004c73cb04584mr28488525qvo.29.1670985168317; Tue, 13 Dec 2022 18:32:48 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1006]) by smtp.gmail.com with ESMTPSA id k12-20020a05620a414c00b006e42a8e9f9bsm9191306qko.121.2022.12.13.18.32.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Dec 2022 18:32:47 -0800 (PST) From: Maxim Cournoyer To: 59761@debbugs.gnu.org Subject: [PATCH v3 4/4] gnu: Add u-boot-ts7970-q-2g-1000mhz-c-bootloader. Date: Tue, 13 Dec 2022 21:32:36 -0500 Message-Id: <20221214023236.25345-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221214023236.25345-1-maxim.cournoyer@gmail.com> References: <20221214023236.25345-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59761 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/bootloader/u-boot.scm (u-boot-ts7970-q-2g-1000mhz-c-bootloader): New variable. --- gnu/bootloader/u-boot.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index 6cad33b741..65d7923465 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017, 2019 Mathieu Othacehe ;;; Copyright © 2020 Julien Lepiller ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,6 +43,7 @@ (define-module (gnu bootloader u-boot) u-boot-puma-rk3399-bootloader u-boot-rock64-rk3328-bootloader u-boot-rockpro64-rk3399-bootloader + u-boot-ts7970-q-2g-1000mhz-c-bootloader u-boot-wandboard-bootloader)) (define install-u-boot @@ -127,6 +129,12 @@ (define install-rockpro64-rk3399-u-boot (define install-pinebook-pro-rk3399-u-boot install-rockpro64-rk3399-u-boot) +(define install-u-boot-ts7970-q-2g-1000mhz-c-u-boot + #~(lambda (bootloader device mount-point) + (let ((u-boot.imx (string-append bootloader "/libexec/u-boot.imx")) + (install-dir (string-append mount-point "/boot"))) + (install-file u-boot.imx install-dir)))) + ;;; @@ -255,3 +263,13 @@ (define u-boot-pinebook-pro-rk3399-bootloader (inherit u-boot-bootloader) (package u-boot-pinebook-pro-rk3399) (disk-image-installer install-pinebook-pro-rk3399-u-boot))) + +(define u-boot-ts7970-q-2g-1000mhz-c-bootloader + ;; This bootloader doesn't really need to be installed, as it is read from + ;; an SPI memory chip, not the SD card. It is copied to /boot/u-boot.imx + ;; for convenience and should be manually flashed at the U-Boot prompt. + (bootloader + (inherit u-boot-bootloader) + (package u-boot-ts7970-q-2g-1000mhz-c) + (installer install-u-boot-ts7970-q-2g-1000mhz-c-u-boot) + (disk-image-installer #f))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 13 21:32:54 2022 Received: (at 59761) by debbugs.gnu.org; 14 Dec 2022 02:32:54 +0000 Received: from localhost ([127.0.0.1]:36089 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5HZm-0000Xs-55 for submit@debbugs.gnu.org; Tue, 13 Dec 2022 21:32:54 -0500 Received: from mail-qt1-f178.google.com ([209.85.160.178]:33774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5HZi-0000XH-C9 for 59761@debbugs.gnu.org; Tue, 13 Dec 2022 21:32:50 -0500 Received: by mail-qt1-f178.google.com with SMTP id fu10so1589622qtb.0 for <59761@debbugs.gnu.org>; Tue, 13 Dec 2022 18:32:50 -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=XZqXVfTzn5YRnOeFCio1oq27IwTOUyMmow397x5rFz8=; b=iK1KVOpvh2HJtvVdV0YZ2luPulAkVo71te2x2DROVBxrN1KF1TP5tZpni/Flf6H3bX J2pDXvSyft3IE9B02rkecyj7jmQDEc/5ET27it/1zzVC07F5+1yUeISr/aZYlLUPumtE m9TNFmyToLpP2glErVWBhlPYZu9zK4v98KRnR7CXI+aCYBGzrdaxhU3Zm6d4s+XObPne Un3/IWFYritUUucv1enXqXEVuyZ3rnIY0F6h8ygPkzRcsJiL6qLrvfIhWwVReyo+QCGs Ov+uUT/0SW5uL6kbOe+pVoS3feTZLzfMPtF4TT6UJ0FI3ux0g1efMBDTB1lAZTUwUGpi sJVg== 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=XZqXVfTzn5YRnOeFCio1oq27IwTOUyMmow397x5rFz8=; b=qTkc9KIHuAi/2VybjcUFXTuLn1noNOuALG4KFfGSd5mQFxywJpxsKIHRkmojeugwNh 9LsdA87MzQDBOi4sJvRXipPErbm3jWbI9ckVWZ8BNUWYihcQlX16RcMR4MbEAb0O8aSr q1L/x9nDZuHcB1SlF1Hbpd4V1GpFSpHz46uDRCwe9GvR4QMeFpW5gC41363DbSo69D8F 60rKiLJqllg6MPp1KaoKN7bP9yC2Il68Aa2OigDIcBNFXbxjRTuLF7yq9kBZ3ITadY+A STQxzK/joqmfyN1u35UxaGkrDEcMJCYkn0I/Ued0icirAST1mkAdWffLBLBA0n1B8DkN Jjag== X-Gm-Message-State: ANoB5pkMJm1KyXmN+RJ1/Ro+VeaaF6TPfGm18kbzhiPbOiMwclwffY0U 190nlcimPcZPzQNm5HcJzL49m4VRhaGqBA== X-Google-Smtp-Source: AA0mqf7mW0U27TnTywteOL9MQ0hDhwYFY1Tebu7qc/ht47XXR7c1OKqf8RVQ7yhDgvwzrb1JN13Tmg== X-Received: by 2002:ac8:5756:0:b0:3a6:8700:b471 with SMTP id 22-20020ac85756000000b003a68700b471mr41420843qtx.38.1670985164772; Tue, 13 Dec 2022 18:32:44 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1006]) by smtp.gmail.com with ESMTPSA id k12-20020a05620a414c00b006e42a8e9f9bsm9191306qko.121.2022.12.13.18.32.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Dec 2022 18:32:44 -0800 (PST) From: Maxim Cournoyer To: 59761@debbugs.gnu.org Subject: [PATCH v3 2/4] gnu: make-u-boot-package: Install .imx files. Date: Tue, 13 Dec 2022 21:32:34 -0500 Message-Id: <20221214023236.25345-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221214023236.25345-1-maxim.cournoyer@gmail.com> References: <20221214023236.25345-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59761 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (make-u-boot-package) [phases] : Add imx to the regexp of files considered for installation. --- gnu/packages/bootloaders.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 7ec9bbb543..ab2cf06fd5 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -887,7 +887,7 @@ (define*-public (make-u-boot-package board triplet "sunxi-spl-with-ecc.bin" name)) (find-files "." - ".*\\.(bin|efi|img|spl|itb|dtb|rksd)$")) + ".*\\.(bin|efi|img|imx|spl|itb|dtb|rksd)$")) (find-files "." "^(MLO|SPL)$")))) (mkdir-p libexec) (install-file ".config" libexec) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 13 21:32:55 2022 Received: (at 59761) by debbugs.gnu.org; 14 Dec 2022 02:32:55 +0000 Received: from localhost ([127.0.0.1]:36091 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5HZm-0000Xu-Fi for submit@debbugs.gnu.org; Tue, 13 Dec 2022 21:32:55 -0500 Received: from mail-qv1-f52.google.com ([209.85.219.52]:38702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5HZj-0000XI-K9 for 59761@debbugs.gnu.org; Tue, 13 Dec 2022 21:32:52 -0500 Received: by mail-qv1-f52.google.com with SMTP id pp21so10900295qvb.5 for <59761@debbugs.gnu.org>; Tue, 13 Dec 2022 18:32:51 -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=GzD/1gUpfRpcC5GIq5E+O+IujjtUUyVFqH8QryLhJ+w=; b=IrKlP2VuZd1TsQK0cD2E4z1V5WO4dxUds/IozSSwxufnewELSSFm7ID1+3QOiKkf7R zKSSf1EGRlvxTtwL6gZ2HyE4OkkCeseqROgJgWvrDG1zfK7WFjqZysBaGYBLLuQnjLUn FUxt7zkcokMDttxK3XNJIcsarm3SUeUyjb0Idt2VkAjtRo5F2mRsNV15TH0CUyxqfgkz oizsMBr7T4Hq8O1i5H261CkqjEgcLqKRDdZXj7zO3ZUwY2EnD/ftmNua1xoke3nPg7i5 NYiFSbFO6RwdEKr2PXm5xUXvKv9Cla77gM5w/FB6zHErM78jjVypd/l4hWxY/W7W01Bj VsJg== 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=GzD/1gUpfRpcC5GIq5E+O+IujjtUUyVFqH8QryLhJ+w=; b=TENR527G/OEE4Txr814PuBCOCDZ0gdEa9dPwGFn86xWcPtTOTvhd+7b2Evs2R3ZcwL 5OAwvSyA75K2MgVVGdOtZHtkY90/1BQjcQYPgffBJ/s6SFav/a7Hv34wd8rDzX/8AheQ P7lbF/PLDKzh7IdytikjQnHVYU6gpYV6i4H/W3rX3Hfmi0wqJCpmJ2QKSXx3fGImGbcz D+XGpCgcUO6LWHzpIqy5n85bS+cdfR7xVJryrJmZY4yba+dCRiYoZI1azX4wpCrYn4Pj Fd8NmGVKW3AUtPooYa6XeS39dBw2f8E1bWQgjNu4JRnMT2AnnEi3Q1drOrJDJrYBnSWC OIVA== X-Gm-Message-State: ANoB5plCLfg+1WdnrwC/R9xekV1DVVlmz6xq7oEtNi31WPI+5q5Bj+SF Q0iwmWVg//S0x5GuvkzNPVNOSwDaHtrXGQ== X-Google-Smtp-Source: AA0mqf4zaT7kMN8VbZciBkizPjp4mzlwMS8t9Z/w8ZPqFyKpO+P2Exibwu/VTzB97fKaz3oDi12Z9A== X-Received: by 2002:a0c:dc81:0:b0:4c7:2677:77cc with SMTP id n1-20020a0cdc81000000b004c7267777ccmr36107142qvk.8.1670985165922; Tue, 13 Dec 2022 18:32:45 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1006]) by smtp.gmail.com with ESMTPSA id k12-20020a05620a414c00b006e42a8e9f9bsm9191306qko.121.2022.12.13.18.32.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Dec 2022 18:32:45 -0800 (PST) From: Maxim Cournoyer To: 59761@debbugs.gnu.org Subject: [PATCH v3 3/4] gnu: Add u-boot-ts7970-q-2g-1000mhz-c. Date: Tue, 13 Dec 2022 21:32:35 -0500 Message-Id: <20221214023236.25345-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221214023236.25345-1-maxim.cournoyer@gmail.com> References: <20221214023236.25345-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59761 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (u-boot-ts-mx6): New variable. (u-boot-ts7970-q-2g-1000mhz-c): Likewise. --- gnu/packages/bootloaders.scm | 150 +++++++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index ab2cf06fd5..02c1c1a17a 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1271,6 +1271,156 @@ (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-u-boot + (lambda _ + (substitute* (find-files "include/configs" "^ts[0-9]{4}\\.h$") + ;; Default to boot a standard zImage instead of a uImage. + (("/boot/uImage") + "/boot/zImage") + (("uimage") + "zimage") + (("bootm \\$\\{loadaddr}") + "bootz ${loadaddr}") + ;; This reference DTB is not available in mainline. + (("ts7970-revf.dtb") + "ts7970.dtb") + ;; Enable support for DISTRO_DEFAULTS, which enables to + ;; use 'sysboot' to boot Guix System. Also enable + ;; "standard" boot commands for dealing with discovery and + ;; booting of syslinux configurations (extlinux.conf). + + ;; Disable the stock CONFIG_BOOTCOMMAND to avoid a + ;; redefinition error. + (("CONFIG_BOOTCOMMAND") + "CONFIG_BOOTCOMMAND_DISABLED") + (("CONFIG_BOOTDELAY") + "CONFIG_BOOTDELAY_DISABLED") + ;; Inspired by include/configs/embestmx6boards.h + (("#define CONFIG_EXTRA_ENV_SETTINGS.*" anchor) + (string-append + "#include \n\n" + "#define MEM_LAYOUT_ENV_SETTINGS \\\n" + " \"bootm_size=0x10000000\\0\" \\\n" + " \"kernel_addr_r=0x10800000\\0\" \\\n" + " \"fdt_addr_r=0x18000000\\0\" \\\n" + " \"scriptaddr=0x18100000\\0\" \\\n" + " \"pxefile_addr_r=0x18200000\\0\" \\\n" + " \"ramdisk_addr_r=0x18300000\\0\"\n\n" + "#define BOOT_TARGET_DEVICES(func) \\\n" + " func(MMC, mmc, 0) \\\n" + " func(MMC, mmc, 1) \\\n" + " func(SATA, sata, 0) \\\n" + " func(USB, usb, 0) \\\n" + " func(PXE, pxe, na) \\\n" + " func(DHCP, dhcp, na)\n\n" + "#include \n\n" + anchor + ;; Sadly, the user config CONFIG_DEFAULT_FDT_FILE did + ;; not exist in that older U-Boot, a placeholder is + ;; added here, to be substituted in each TS U-Boot board + ;; package. + " \"fdtfile=DEFAULT_FDT_FILE\\0\" \\\n" + " MEM_LAYOUT_ENV_SETTINGS \\\n" + " BOOTENV \\\n"))))) + (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 _ + (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 a trivial patch not backported from mainline to fix + ;; cross-compilation of tools (see: + ;; https://source.denx.de/u-boot/u-boot/-/commit/ + ;; 3b0825296aeba69c2cbfd3e179db2e9cbe5e70d7). + (substitute* '("tools/Makefile" "tools/env/Makefile") + (("^HOSTCC = \\$\\(CC)" all) + (string-append "override " all))) + (apply invoke "make" "tools-all" make-flags) + (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 + (let ((base + (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 +Systems TS-7970 revision C board, which includes a quad core Freescale i.MX6 +CPU and 2 GiB of RAM clocked at 1000MHz. The binary U-Boot image to flash is +the @file{libexec/u-boot.imx} file. It can be used with the @file{zImage} and +the @file{imx6q-ts7970.dtb} files provided by the +@code{linux-libre-arm-generic} image. + +To flash this bootloader, write it to an SD card, then using the U-Boot serial +console: +@example +mmc dev 0 +load mmc 0:1 ${loadaddr} /u-boot.imx +sf probe +sf erase 0 0x80000 +sf write ${loadaddr} 0x400 $filesize +@end example + +The factory values of U-Boot must also be reset so that it boots using a +zImage instead of the default uImage: +@example +run clearenv +reset +@end example + +For more information, refer to +@url{https://docs.embeddedts.com/TS-7970#Update_U-Boot}."))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (add-after 'patch-u-boot 'set-default-fdt-file + (lambda _ + (substitute* "include/configs/ts7970.h" + (("DEFAULT_FDT_FILE") + "imx6q-ts7970.dtb"))))))))))) + (define-public vboot-utils (package (name "vboot-utils") -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 20 13:22:51 2022 Received: (at 59761) by debbugs.gnu.org; 20 Dec 2022 18:22:51 +0000 Received: from localhost ([127.0.0.1]:46395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hGM-0001oo-Og for submit@debbugs.gnu.org; Tue, 20 Dec 2022 13:22:51 -0500 Received: from mail-qt1-f178.google.com ([209.85.160.178]:38506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hGL-0001od-3w for 59761@debbugs.gnu.org; Tue, 20 Dec 2022 13:22:49 -0500 Received: by mail-qt1-f178.google.com with SMTP id z12so11724454qtv.5 for <59761@debbugs.gnu.org>; Tue, 20 Dec 2022 10:22:49 -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=tyUOhxAa1k0n0nh5pkSnSVwHpV6GO0vLiCwz+lrYtko=; b=FABBMR9jON2t6Yl/nDnI4c2LNGNEF6AY/ebHAQsLB4io4yHyhzJ2YuZENY3VzUTnHe qroETYlTmxVAeQmNJvolNFsBhXVbUOSC6jYo2+I6K6aIWGqfGjHwt2M1ZHCYl8pPPTDf Vf/PLon4EgpW16eCjS9p8LLD5eOT9OvxBGdfMah2JRdHFENJ9JMRYcKbTrwMOEwi+JkI xBpupJfwIOeWDTA8fNHd+WCY8hy1RvNGwrw0/68duM8zeB0cy7Axl0FjYQqKm5TX+tzY HnHD4Le/sf0TED6TAlynk64P+TTBCGkJglN2dogFkgqWzhMU4o22sLjHEqcq4VnV2CBr XfZQ== 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=tyUOhxAa1k0n0nh5pkSnSVwHpV6GO0vLiCwz+lrYtko=; b=5EpJxDW0HQeW31MCgk1YInPVKZyrkATHebzmJaRMTEYaMGWVLRNrF/fI+39daQY422 TmWKd/erB4Aeq/YjobSJHA1ixzLpcvMvDf7ZbkoMjgQvkj0zAcjAKe4ZcUZu37zEwRee 0x/id32HAsgm4o76RvwJRYpRIyNPRFazjUcAB4fpHJ6jH638EpxJgzDydiFJNb82NZcB oT+s4GM+00GF/+B7csLnulqZZoPOA3JbOuildSP0LBJligvPEQ68F+yRy/lWhm+Zan64 /gEne9iK44f/9Cx3GS8QUQEwycWjfuLVB4hocgLfYYjVSUleOlIT3rbsoLpy5LvOKKCe J1Ug== X-Gm-Message-State: ANoB5pnKpVgvgOg661N0QYmSgWuJOmIZ6xUlaxLGE8nHB6snydUWBBmY feuYE+ZyADHf0R7GyowUHLWKrjessjAhF/OP X-Google-Smtp-Source: AA0mqf4gIdshu+B20RrQhV0Mcbr3sH+cNh91Uz/wiFW6vkaCerqgT62P0vZG+YjTeYgPyd1awm7mwA== X-Received: by 2002:a05:622a:5c8f:b0:3a8:199b:dcac with SMTP id ge15-20020a05622a5c8f00b003a8199bdcacmr49018566qtb.15.1671560563130; Tue, 20 Dec 2022 10:22:43 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1002]) by smtp.gmail.com with ESMTPSA id bq17-20020a05622a1c1100b00397e97baa96sm7951370qtb.0.2022.12.20.10.22.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 10:22:42 -0800 (PST) From: Maxim Cournoyer To: 59761@debbugs.gnu.org Subject: [PATCH v4 1/2] gnu: Add u-boot-ts7970-q-2g-1000mhz-c. Date: Tue, 20 Dec 2022 13:22:34 -0500 Message-Id: <20221220182236.30360-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59761 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (u-boot-ts-mx6): New variable. (u-boot-ts7970-q-2g-1000mhz-c): Likewise. --- (no changes since v1) gnu/packages/bootloaders.scm | 150 +++++++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 738f3975f5..545803ece1 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1251,6 +1251,156 @@ (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-u-boot + (lambda _ + (substitute* (find-files "include/configs" "^ts[0-9]{4}\\.h$") + ;; Default to boot a standard zImage instead of a uImage. + (("/boot/uImage") + "/boot/zImage") + (("uimage") + "zimage") + (("bootm \\$\\{loadaddr}") + "bootz ${loadaddr}") + ;; This reference DTB is not available in mainline. + (("ts7970-revf.dtb") + "ts7970.dtb") + ;; Enable support for DISTRO_DEFAULTS, which enables to + ;; use 'sysboot' to boot Guix System. Also enable + ;; "standard" boot commands for dealing with discovery and + ;; booting of syslinux configurations (extlinux.conf). + + ;; Disable the stock CONFIG_BOOTCOMMAND to avoid a + ;; redefinition error. + (("CONFIG_BOOTCOMMAND") + "CONFIG_BOOTCOMMAND_DISABLED") + (("CONFIG_BOOTDELAY") + "CONFIG_BOOTDELAY_DISABLED") + ;; Inspired by include/configs/embestmx6boards.h + (("#define CONFIG_EXTRA_ENV_SETTINGS.*" anchor) + (string-append + "#include \n\n" + "#define MEM_LAYOUT_ENV_SETTINGS \\\n" + " \"bootm_size=0x10000000\\0\" \\\n" + " \"kernel_addr_r=0x10800000\\0\" \\\n" + " \"fdt_addr_r=0x18000000\\0\" \\\n" + " \"scriptaddr=0x18100000\\0\" \\\n" + " \"pxefile_addr_r=0x18200000\\0\" \\\n" + " \"ramdisk_addr_r=0x18300000\\0\"\n\n" + "#define BOOT_TARGET_DEVICES(func) \\\n" + " func(MMC, mmc, 0) \\\n" + " func(MMC, mmc, 1) \\\n" + " func(SATA, sata, 0) \\\n" + " func(USB, usb, 0) \\\n" + " func(PXE, pxe, na) \\\n" + " func(DHCP, dhcp, na)\n\n" + "#include \n\n" + anchor + ;; Sadly, the user config CONFIG_DEFAULT_FDT_FILE did + ;; not exist in that older U-Boot, a placeholder is + ;; added here, to be substituted in each TS U-Boot board + ;; package. + " \"fdtfile=DEFAULT_FDT_FILE\\0\" \\\n" + " MEM_LAYOUT_ENV_SETTINGS \\\n" + " BOOTENV \\\n"))))) + (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 _ + (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 a trivial patch not backported from mainline to fix + ;; cross-compilation of tools (see: + ;; https://source.denx.de/u-boot/u-boot/-/commit/ + ;; 3b0825296aeba69c2cbfd3e179db2e9cbe5e70d7). + (substitute* '("tools/Makefile" "tools/env/Makefile") + (("^HOSTCC = \\$\\(CC)" all) + (string-append "override " all))) + (apply invoke "make" "tools-all" make-flags) + (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 + (let ((base + (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 +Systems TS-7970 revision C board, which includes a quad core Freescale i.MX6 +CPU and 2 GiB of RAM clocked at 1000MHz. The binary U-Boot image to flash is +the @file{libexec/u-boot.imx} file. It can be used with the @file{zImage} and +the @file{imx6q-ts7970.dtb} files provided by the +@code{linux-libre-arm-generic} image. + +To flash this bootloader, write it to an SD card, then using the U-Boot serial +console: +@example +mmc dev 0 +load mmc 0:1 ${loadaddr} /u-boot.imx +sf probe +sf erase 0 0x80000 +sf write ${loadaddr} 0x400 $filesize +@end example + +The factory values of U-Boot must also be reset so that it boots using a +zImage instead of the default uImage: +@example +run clearenv +reset +@end example + +For more information, refer to +@url{https://docs.embeddedts.com/TS-7970#Update_U-Boot}."))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (add-after 'patch-u-boot 'set-default-fdt-file + (lambda _ + (substitute* "include/configs/ts7970.h" + (("DEFAULT_FDT_FILE") + "imx6q-ts7970.dtb"))))))))))) + (define-public vboot-utils (package (name "vboot-utils") base-commit: daaef7858ffe2d0eb0378670a6447400410d1ff9 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 20 13:22:54 2022 Received: (at 59761) by debbugs.gnu.org; 20 Dec 2022 18:22:54 +0000 Received: from localhost ([127.0.0.1]:46398 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hGQ-0001p2-Cb for submit@debbugs.gnu.org; Tue, 20 Dec 2022 13:22:54 -0500 Received: from mail-qt1-f174.google.com ([209.85.160.174]:36661) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hGO-0001og-3V for 59761@debbugs.gnu.org; Tue, 20 Dec 2022 13:22:52 -0500 Received: by mail-qt1-f174.google.com with SMTP id bq12so1564144qtb.3 for <59761@debbugs.gnu.org>; Tue, 20 Dec 2022 10:22:52 -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=VB4pEJkf6N4DkYHXi2KpmARMky7B05R/ez/Wg6daR7c=; b=Qx2Hw9NE5YnWBZuaaVQURU/2+UR3nYAsn7MB4wqmXlYB7iQGkZLDEVavN7zCSBJTIL WKb/7RbK+DCbQ4PAASMNBcEP1v4jmvGdtawFt1DhcgqxUtIdGltk/Vr9QYEigJH8V/+e F7kDMODEkiNMYwLRZNhght3h40RHFo9Ap2Y77tE4fDknAJPE1GtXMsnfucWLSwdCgluD DW5sQ6+vAqCXjjoWpORH3ywSR90g2OdpjRy5C9X0m0yat9GokKxDRK/mdF+GhEdCwfux LOVt95o4acP2YLpFE1m7mduEtcZFxKs5QjHcLVFbt4S44S7cs4WYOnUSdnXlWNZ8wTQr iI7Q== 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=VB4pEJkf6N4DkYHXi2KpmARMky7B05R/ez/Wg6daR7c=; b=fjBODrF/OjM6QK0ECc1MaLXj9PTsF/PgRLNug67jV4fGCsoqHZl297UT5s/ubt7E47 jjS4KtzJhWNBVjL5eawfV+jKahXRmZfyVaw4Un4d8ckV37yY5YI3/8xihztk6VSDXxTb E/KGD+4e/nO7aQqQOniYF1zwTJiE9XOT5OvlESEFmgubJy+iou06wzRi+mwvUN3ZRs7s 9KhGFmiuwdfY0zDXOiP/i6DnMMgwQ8mRpcadrdjJYXqdy74Kl07PeJifLbYyDOmK7/Gz 5whqJDVNQ40WdZMyv+sB1MU1z+NWNy+u8ONpN08SjWpGLcEBunAFTZ1eRiy1h0DU7a5T O37A== X-Gm-Message-State: AFqh2kozUDbUdEKiawzqT4Tv2KDy/WcTl+LkZxfMXxgMitPxhnBeBrOi SjsQp1FeQ2ZnhAVwEZ2EJ0sm74wAHFHtX7j+ X-Google-Smtp-Source: AMrXdXulR6BGZvzd7vFLygE38YNDPGwXoxYmODC23IHm/fSLl00KrFuMJ89kIhtOx/rBOnnYwsmVbw== X-Received: by 2002:a05:622a:1dcb:b0:3a7:e426:2892 with SMTP id bn11-20020a05622a1dcb00b003a7e4262892mr4426409qtb.28.1671560566481; Tue, 20 Dec 2022 10:22:46 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1002]) by smtp.gmail.com with ESMTPSA id bq17-20020a05622a1c1100b00397e97baa96sm7951370qtb.0.2022.12.20.10.22.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 10:22:46 -0800 (PST) From: Maxim Cournoyer To: 59761@debbugs.gnu.org Subject: [PATCH v4 2/2] gnu: Add u-boot-ts7970-q-2g-1000mhz-c-bootloader. Date: Tue, 20 Dec 2022 13:22:35 -0500 Message-Id: <20221220182236.30360-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221220182236.30360-1-maxim.cournoyer@gmail.com> References: <20221220182236.30360-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59761 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/bootloader/u-boot.scm (u-boot-ts7970-q-2g-1000mhz-c-bootloader): New variable. --- Changes in v4: - Rebase on top of #60224 and master gnu/bootloader/u-boot.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index 6cad33b741..65d7923465 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017, 2019 Mathieu Othacehe ;;; Copyright © 2020 Julien Lepiller ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,6 +43,7 @@ (define-module (gnu bootloader u-boot) u-boot-puma-rk3399-bootloader u-boot-rock64-rk3328-bootloader u-boot-rockpro64-rk3399-bootloader + u-boot-ts7970-q-2g-1000mhz-c-bootloader u-boot-wandboard-bootloader)) (define install-u-boot @@ -127,6 +129,12 @@ (define install-rockpro64-rk3399-u-boot (define install-pinebook-pro-rk3399-u-boot install-rockpro64-rk3399-u-boot) +(define install-u-boot-ts7970-q-2g-1000mhz-c-u-boot + #~(lambda (bootloader device mount-point) + (let ((u-boot.imx (string-append bootloader "/libexec/u-boot.imx")) + (install-dir (string-append mount-point "/boot"))) + (install-file u-boot.imx install-dir)))) + ;;; @@ -255,3 +263,13 @@ (define u-boot-pinebook-pro-rk3399-bootloader (inherit u-boot-bootloader) (package u-boot-pinebook-pro-rk3399) (disk-image-installer install-pinebook-pro-rk3399-u-boot))) + +(define u-boot-ts7970-q-2g-1000mhz-c-bootloader + ;; This bootloader doesn't really need to be installed, as it is read from + ;; an SPI memory chip, not the SD card. It is copied to /boot/u-boot.imx + ;; for convenience and should be manually flashed at the U-Boot prompt. + (bootloader + (inherit u-boot-bootloader) + (package u-boot-ts7970-q-2g-1000mhz-c) + (installer install-u-boot-ts7970-q-2g-1000mhz-c-u-boot) + (disk-image-installer #f))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 20 13:35:12 2022 Received: (at control) by debbugs.gnu.org; 20 Dec 2022 18:35:12 +0000 Received: from localhost ([127.0.0.1]:46493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hSK-0004KD-HH for submit@debbugs.gnu.org; Tue, 20 Dec 2022 13:35:12 -0500 Received: from mail-qv1-f51.google.com ([209.85.219.51]:40614) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hSJ-0004Jp-79 for control@debbugs.gnu.org; Tue, 20 Dec 2022 13:35:11 -0500 Received: by mail-qv1-f51.google.com with SMTP id h10so8773147qvq.7 for ; Tue, 20 Dec 2022 10:35:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:from:to:message-id:date:from:to:cc:subject:date:message-id :reply-to; bh=YycOApN1gvkmgdp+cziRc339Jin2QmY/xWDUcUVpdwE=; b=VgOPaXsF3G+b536VqBc1iWDgu8CPrj7YweVaXdVmngIoovQ0z/9U7n1KCZZK+y25Nf 935LwqZU3lzojNwcXEcPmxPzmd0JIExhLdUMMxb5ZSNkl6omfvT58o9rHqfxW3JJR7al qxGLpz9AGy1OAXNu6ecnuFlea25RMjg8+HfZKtyCDqaSDocyQa02CHpsdVwqOkEPZyRz NDD0lyeMB5DoKgPR0hTQ+zWuukv9H8C11H2NyrFTNCBAn8Pm6jCiVTiyJ0tWQSNz+lwM 88C57cwsrnHHoBewpx62p/moFu7KmyfmqxysLO0SCttXAZvc2TN4MYDo7fiEe1qeOmwt mISg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=subject:from:to:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YycOApN1gvkmgdp+cziRc339Jin2QmY/xWDUcUVpdwE=; b=eMUoBedVdvszac8roNEhXQn+u3GyH9WeGXe0xIp/99K2NE8Ha4gVPV2hHOZpGixIkq O0RVB8f+B1JejeD9R/262GakzHc4ZoUkD0nx4E2JoH3JwgDKLU8LixRNcZ6w4bcpbv0S l4zagVn9kC9pSa0r7JQgT6Xe8lXGoV6hX8DP0ynP4NP1z8wY9cksmLNJuPAfHzWmrYxG pmF2OlSxqn7l7aOyUUAbxUaSaJi2U7UEzghpoZXitvoB1Wb9q/YGkh6VH5ToHfwfoNhC O+78Ol/MvnFzwh+fGjQ6IuKj9slU/7qERPqF8AVOeX423ftZ0AKBGwIchuGaeWIVRbpR zUMw== X-Gm-Message-State: ANoB5pnkFljpzCXmsysYn+MOh6G3KZX+kZe/OquAaM3eEdqbQMd2ikgO D405pCpVDvUKUEeM56CLkdSp6NG8jwXvO8M7 X-Google-Smtp-Source: AA0mqf7Qon7Z6mK07onz0/AtAb8UDEv8RryjbC2QZaI3DPFJGaEcafnVT8s5x52ze6Ky4FCq8Y/Bmg== X-Received: by 2002:a05:6214:2b92:b0:4c7:884a:9691 with SMTP id kr18-20020a0562142b9200b004c7884a9691mr64030032qvb.0.1671561305534; Tue, 20 Dec 2022 10:35:05 -0800 (PST) Received: from hurd ([2607:fad8:4:3::1002]) by smtp.gmail.com with ESMTPSA id n17-20020a05620a223100b006fc40dafaa2sm8935166qkh.8.2022.12.20.10.35.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 10:35:05 -0800 (PST) Date: Tue, 20 Dec 2022 13:35:04 -0500 Message-Id: <87ili553fr.fsf@gmail.com> To: control@debbugs.gnu.org From: Maxim Cournoyer Subject: control message for bug #59761 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) block 59761 by 60224 quit From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 29 14:38:52 2022 Received: (at 59761) by debbugs.gnu.org; 29 Dec 2022 19:38:52 +0000 Received: from localhost ([127.0.0.1]:32944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAyjr-0003bH-QR for submit@debbugs.gnu.org; Thu, 29 Dec 2022 14:38:52 -0500 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21138) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAyjp-0003b4-O4 for 59761@debbugs.gnu.org; Thu, 29 Dec 2022 14:38:50 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1672342727; cv=none; d=zohomail.com; s=zohoarc; b=BHwjV9hDv66l1+8Hv/XsNzkyclhkZOf/ZJ7MYRfg8AwgnKJE1mGypv1DZrQq8Xsng3mVCs/c/iuArZNa1+Q7WtZy0V2+HrxWIpJUPrrc+YpZlloXDYrRkjo3BwOlLGFfEnHLJGIF0vm7Axb4r5c/mNXsPgvZuRytLvAlKy2iAVA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672342727; h=Content-Type:Content-Transfer-Encoding:Date:From:MIME-Version:Message-ID:Subject:To; bh=pbbrbqLi1/lMeRmjAMBFWj4doBgMEMMGN2XL168Qau4=; b=bn8B8o6xNWbTslHSZqCTF1iQQGm2cGcISk/MiHbagbSZnWyXkWtGJzqkTBrKJFDTAm3/4B4KFDYlLIc2aGZUSHTrbSkZz64AkkH9Ns+zT3FeKgAbI/pXV6tP4lEjJ2Ogb0M/Qru7hTrAf1s/KNIZ7oq+2LF3SfzWhDdUt60Go/k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1672342727; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:From:To:To:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To:Cc; bh=pbbrbqLi1/lMeRmjAMBFWj4doBgMEMMGN2XL168Qau4=; b=GhQmjTl+mE38W/E/9VAA0cT+nFZaahjteVV+XlNzTBXhPohF6jgSvIdqQ9/RzduO DWN3qmM05JTXA83fREH8tQXJs2d3NWgr3uzaxXsZrUiegR4RGPo7CRAz0+rxAcI0UH+ qcalPe5EHzoRMBmZTX7PX3zt22NUiozgumV15gGM= Received: from localhost (1-108-142-46.pool.kielnet.net [46.142.108.1]) by mx.zohomail.com with SMTPS id 16723427259997.328192017408924; Thu, 29 Dec 2022 11:38:45 -0800 (PST) User-agent: mu4e 1.8.13; emacs 28.2 From: Ricardo Wurmus To: 59761@debbugs.gnu.org Subject: [PATCH 0/2] Add u-boot-ts7970-q-2g-1000mhz-c. Date: Thu, 29 Dec 2022 20:33:16 +0100 X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Message-ID: <871qoi9f0b.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59761 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Maxim, there seems to be some overlap between this and https://issues.guix.gnu.org/60224. Looking just at v4 I only have one comment. In your substitute* replacements it=E2=80=99s better not to use string-appe= nd. You can include real line breaks in a string and escape line breaks with \. This is preferable to gluing strings together. For something as long as the replacements in this package consider using a patch file instead. This has the added advantage of failing the build when the patch cannot be applied cleanly. The rest looks good to me. --=20 Ricardo From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 03 23:17:13 2023 Received: (at 59761) by debbugs.gnu.org; 4 Jan 2023 04:17:13 +0000 Received: from localhost ([127.0.0.1]:47257 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCvDE-0007Cm-QA for submit@debbugs.gnu.org; Tue, 03 Jan 2023 23:17:13 -0500 Received: from mail-qt1-f177.google.com ([209.85.160.177]:46879) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCvDA-0007CX-A0 for 59761@debbugs.gnu.org; Tue, 03 Jan 2023 23:17:12 -0500 Received: by mail-qt1-f177.google.com with SMTP id x11so26386960qtv.13 for <59761@debbugs.gnu.org>; Tue, 03 Jan 2023 20:17:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=V0d6m04ZyCXn1QBu2pxzD/7MkoZHkdVnyByS5RLj+/E=; b=DLjXjuV7sIfqUF+GQrGTU2w3zfnyBaKnhL8XEIzRr6vB0RvJ36tPpy5GCEirMriatk vNg9CSUMdhD2SovXTkBnOw0sZ4VrbkOSfsXSmmD9W9wZu17EnikRFpsN0k/IKF0z4F/D 02zoRVGHEphljI5T/d0DcnGMn+HAHmdNgCRF8mtg8s+I7Ps+1HbF1jGGAHYLbLAlF7ou ry/6S50DVHm0yLBEdvizNj7c44rElanfW8Ri9sHW79ecUfcy44yJWxCOTpGEg2OI7aKn E4/bclVp+HycsYp2fmwFG6MvraVbmAHrydyOdjppmBQK5IvHbOGwD+fi3qh8gH+7cVzB MnOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=V0d6m04ZyCXn1QBu2pxzD/7MkoZHkdVnyByS5RLj+/E=; b=Ad0rhEeu80WKPVJhDIC11UJq5K6wdi0yeeW1w1zh+X7TpLhxlNVcj8H57zHfMjCgkP ewqacUnrvSW+KQfKkMyP9XED08y2zu7pQJXOGcAzpY0QNvkamtcTnqdGQUZqfckpdjM7 mvGMJmBVG0HiQ/2+tFOiqDbIes/V/PGqCWv383uCbiIQME0R9WSTsI+b/NQ0ag8K9AqY 2INnHNlFwoNjq7oEH1OcwTxdX7qMI0bTH+X4W0yRsdrVmC3DuAmvEHIk3+X1MhHVPjb2 aiVXw7sWkslsjKS8GS46cqAW2h/L+jhkbdz1DyC/TP3g2D9m4u0JqWxCaAEzQWx5dgio 1zOg== X-Gm-Message-State: AFqh2koD0IbwHzYgI6kZsb6sRfbM//v/nFxg7gCMC9l5hoJCLYKmOw4N ZfrVPmkKDPVl3Kt8X4fdtuCAjSglr8NtQv2r X-Google-Smtp-Source: AMrXdXuE6yFHjQbGq+dnOvGMcR85SGZUBXlFwIPseVHOyH8ze27XCNbnscI0pGf+UP+m0QdpTvCouw== X-Received: by 2002:ac8:1287:0:b0:3a8:23d4:8d2b with SMTP id y7-20020ac81287000000b003a823d48d2bmr63405444qti.10.1672805822506; Tue, 03 Jan 2023 20:17:02 -0800 (PST) Received: from hurd (dsl-10-135-221.b2b2c.ca. [72.10.135.221]) by smtp.gmail.com with ESMTPSA id i17-20020a05620a405100b006fcb77f3bd6sm23930615qko.98.2023.01.03.20.17.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jan 2023 20:17:02 -0800 (PST) From: Maxim Cournoyer To: Ricardo Wurmus Subject: Re: bug#59761: [PATCH 0/2] Add u-boot-ts7970-q-2g-1000mhz-c. References: <20221202052903.10475-1-maxim.cournoyer@gmail.com> <871qoi9f0b.fsf@elephly.net> Date: Tue, 03 Jan 2023 23:17:00 -0500 In-Reply-To: <871qoi9f0b.fsf@elephly.net> (Ricardo Wurmus's message of "Thu, 29 Dec 2022 20:33:16 +0100") Message-ID: <87ilhnvsqr.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59761 Cc: 59761@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Ricardo, Ricardo Wurmus writes: > Hi Maxim, > > there seems to be some overlap between this and > https://issues.guix.gnu.org/60224. Yes, I ended up splitting my changes focusing on u-boot in #60224, which should be reviewed before and blocking this change here, which is based on it. > Looking just at v4 I only have one > comment. > > In your substitute* replacements it=E2=80=99s better not to use string-ap= pend. Oh? Why is this so? There must be hundreds of string-append occurences used in such place, so I'm curious. > You can include real line breaks in a string and escape line breaks with > \. This is preferable to gluing strings together. OK, I guess this is your rationale for the above comment (cleaner). > For something as > long as the replacements in this package consider using a patch file > instead. This has the added advantage of failing the build when the > patch cannot be applied cleanly. I agree that a patch would be most suitable here, especially that if something breaks, if would likely be silent (unlikely to be caught at build time). I'll extract this as a patch. > The rest looks good to me. OK. I'll await your comments on #60224, which is awaiting feedback post-rework based on your earlier feedback. PS: I had also missed that email; please keep me in CC in all your replies :-). --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 04 00:32:56 2023 Received: (at 59761) by debbugs.gnu.org; 4 Jan 2023 05:32:56 +0000 Received: from localhost ([127.0.0.1]:47316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCwOT-0000k1-MI for submit@debbugs.gnu.org; Wed, 04 Jan 2023 00:32:56 -0500 Received: from mail-qt1-f175.google.com ([209.85.160.175]:38799) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCwOO-0000jO-AL for 59761@debbugs.gnu.org; Wed, 04 Jan 2023 00:32:52 -0500 Received: by mail-qt1-f175.google.com with SMTP id z12so26503603qtv.5 for <59761@debbugs.gnu.org>; Tue, 03 Jan 2023 21:32:48 -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=JTfk8qNo3jjxcI9OVg0PGsusI1YcP+Rz1IQ260AMjGo=; b=pktDkLNCQvSk8oNubOcbwk7zgB5Yi/yDCBpmyYRmMK+8dWta+nY9juTTKQlcDR0ITS 22anbKnSe2DHj0mG6Ev0MqnGS8LWiBpFwN0NkjLdgT3KLAydc5d9lKtghLuzvrP1hrxG E5VNU3fosbk6TNlM7+ZBzYGqyjPY7cGIe/Knr2YEHitWkgjjU38IvTU6r9oQDC9JssAf COVInBdRV2DMzo5U7b5MrdRsZ8gQHjuozf+CTWu+gubFn5icAmQbY+i0yXiUTggL016w iHnpmf37X2um/M6xbm6Ft5rUZbDp8+yPt2x2A4giGB2/HmhbIqP6Swh6dgptS3k4IM8+ zeFQ== 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=JTfk8qNo3jjxcI9OVg0PGsusI1YcP+Rz1IQ260AMjGo=; b=cS1P1yvX+6c0ivYwha+2d7uBzqPGhQlUrVrEE1INnE+W+MW2GmrEVaFjW7B7dbuYA9 Q3dwZX6/RolZI62mCSSq6silw6qdr7HGDpAU35svZhX8rFSI9Ue65D6T+R+BqnPhcArd gaVX/BBZGfw2b7FAFNeknYBH57XggCB1COyKmvFaZ+PkpiqvlA84QR0vIiD8ep4kuNEt QO8vB7XO/3kZUEBXjphK89/1GGa/DYzpThqJgxl9uITAW9j8RYYYmCg7BmcJmjKoYHEl E/NoU+23AUU+Y6pEbHOKQsQ/FblKpbrAFr35/7dKOw9dvm5kggqwo081NovRr0wuDCsg BOlg== X-Gm-Message-State: AFqh2kpeD+djxSL0rToZ4S6sWPSHBd174Wo15FoQJoQuXt/Id/zXxyvF hGsETufxVZ8mDUQvmvGpgDBZ33YOoD86J2Cx X-Google-Smtp-Source: AMrXdXvk8bgtDJnG107NtcAtguRpfTj87Z1UlnuWM+TsBD7/8bza7cJsboZeTHl229PUo6VyNSmkiA== X-Received: by 2002:ac8:7616:0:b0:3ab:5f5f:a0d7 with SMTP id t22-20020ac87616000000b003ab5f5fa0d7mr72335617qtq.2.1672810362630; Tue, 03 Jan 2023 21:32:42 -0800 (PST) Received: from localhost.localdomain (dsl-10-135-221.b2b2c.ca. [72.10.135.221]) by smtp.gmail.com with ESMTPSA id s13-20020a05620a0bcd00b006e16dcf99c8sm23682508qki.71.2023.01.03.21.32.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jan 2023 21:32:42 -0800 (PST) From: Maxim Cournoyer To: 59761@debbugs.gnu.org Subject: [PATCH v5 1/2] gnu: Add u-boot-ts7970-q-2g-1000mhz-c. Date: Wed, 4 Jan 2023 00:32:33 -0500 Message-Id: <20230104053234.4540-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59761 Cc: rekado@elephly.net, Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (u-boot-ts-mx6): New variable. (u-boot-ts7970-q-2g-1000mhz-c): Likewise. --- Changes in v5: - Update package revision to 08809160fbc60d6e949fa9d37d9a41aab8fef742 - Refactor patch-u-boot phase to use single string blocks - Drop upstreamed patch in build+install-tools phase gnu/packages/bootloaders.scm | 148 +++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 7016b33f4f..22c15d13f1 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1339,6 +1339,154 @@ (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 "08809160fbc60d6e949fa9d37d9a41aab8fef742")) + (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 + "01mja33351hkcs59rmfvppqlxqw4rh9gng7a7hx2cfspqwh2y6kr")))) + (arguments + (substitute-keyword-arguments (package-arguments u-boot) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (add-after 'unpack 'patch-u-boot + (lambda _ + (substitute* (find-files "include/configs" "^ts[0-9]{4}\\.h$") + ;; Default to boot a standard zImage instead of a uImage. + (("/boot/uImage") + "/boot/zImage") + (("uimage") + "zimage") + (("bootm \\$\\{loadaddr}") + "bootz ${loadaddr}") + ;; This reference DTB is not available in mainline. + (("ts7970-revf.dtb") + "ts7970.dtb") + ;; Enable support for DISTRO_DEFAULTS, which enables to + ;; use 'sysboot' to boot Guix System. Also enable + ;; "standard" boot commands for dealing with discovery and + ;; booting of syslinux configurations (extlinux.conf). + + ;; Disable the stock CONFIG_BOOTCOMMAND to avoid a + ;; redefinition error. + (("CONFIG_BOOTCOMMAND") + "CONFIG_BOOTCOMMAND_DISABLED") + (("CONFIG_BOOTDELAY") + "CONFIG_BOOTDELAY_DISABLED") + ;; Inspired by include/configs/embestmx6boards.h + (("#define CONFIG_EXTRA_ENV_SETTINGS.*" anchor) + (string-append "\ +#include + +#define MEM_LAYOUT_ENV_SETTINGS \\ +\t\"bootm_size=0x10000000\\0\" \\ +\t\"kernel_addr_r=0x10800000\\0\" \\ +\t\"fdt_addr_r=0x18000000\\0\" \\ +\t\"scriptaddr=0x18100000\\0\" \\ +\t\"pxefile_addr_r=0x18200000\\0\" \\ +\t\"ramdisk_addr_r=0x18300000\\0\" + +#define BOOT_TARGET_DEVICES(func) \\ +\tfunc(MMC, mmc, 0) \\ +\tfunc(MMC, mmc, 1) \\ +\tfunc(SATA, sata, 0) \\ +\tfunc(USB, usb, 0) \\ +\tfunc(PXE, pxe, na) \\ +\tfunc(DHCP, dhcp, na) + +#include + +" anchor + +;; Sadly, the user config CONFIG_DEFAULT_FDT_FILE did not exist in that older +;; U-Boot. A placeholder is added here, to be substituted in each TS U-Boot +;; board package. +"\ +\t\"fdtfile=DEFAULT_FDT_FILE\\0\" \\ +\tMEM_LAYOUT_ENV_SETTINGS \\ +\tBOOTENV \\\n"))))) + (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 _ + (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) + (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 + (let ((base + (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 +Systems TS-7970 revision C board, which includes a quad core Freescale i.MX6 +CPU and 2 GiB of RAM clocked at 1000MHz. The binary U-Boot image to flash is +the @file{libexec/u-boot.imx} file. It can be used with the @file{zImage} and +the @file{imx6q-ts7970.dtb} files provided by the +@code{linux-libre-arm-generic} image. + +To flash this bootloader, write it to an SD card, then using the U-Boot serial +console: +@example +mmc dev 0 +load mmc 0:1 ${loadaddr} /u-boot.imx +sf probe +sf erase 0 0x80000 +sf write ${loadaddr} 0x400 $filesize +@end example + +The factory values of U-Boot must also be reset so that it boots using a +zImage instead of the default uImage: +@example +run clearenv +reset +@end example + +For more information, refer to +@url{https://docs.embeddedts.com/TS-7970#Update_U-Boot}."))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (add-after 'patch-u-boot 'set-default-fdt-file + (lambda _ + (substitute* "include/configs/ts7970.h" + (("DEFAULT_FDT_FILE") + "imx6q-ts7970.dtb"))))))))))) + (define-public vboot-utils (package (name "vboot-utils") base-commit: fef10282afdb97af43d1ec1c0c955a7fdc313e3c -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 04 00:32:57 2023 Received: (at 59761) by debbugs.gnu.org; 4 Jan 2023 05:32:57 +0000 Received: from localhost ([127.0.0.1]:47318 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCwOW-0000k7-Ra for submit@debbugs.gnu.org; Wed, 04 Jan 2023 00:32:57 -0500 Received: from mail-qt1-f177.google.com ([209.85.160.177]:44682) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCwOQ-0000jS-TK for 59761@debbugs.gnu.org; Wed, 04 Jan 2023 00:32:53 -0500 Received: by mail-qt1-f177.google.com with SMTP id c11so26460389qtn.11 for <59761@debbugs.gnu.org>; Tue, 03 Jan 2023 21:32:50 -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=4bOTIEwT1y3auEQ+1t7F6EHFE8nN0gb2AdxrWCK1Dok=; b=RGGQBv8BTJYucRgSwDE+Exqbs8FQnUL2s0Auj9O1nEA10QrqrxodHQCRPLSHyWAxdY iVf8vYSrW3ptvKxX6zYQX/njKW+dqcwXXXqkLHj0hfbeCMpNyFhMPUZB792X8NP86mkL eJByJuFqSCnPvV8UJOuziShX10IGuZ6Gl585if/D+BzepLw+rn1dZsFp8MWQyyAg7KEf j0Hat2990T2sLA4OV5/T5LpwJ8P3Fi5d/HcwuxqZhhcdyCPMz/lOJC4VdakKlsaGCquF QzVT5r/lT9VbP7wXYYiqSr02BZGZsUoDvUNCjLDXd4jAzbELrYatd883JujecjuPICqy eRug== 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=4bOTIEwT1y3auEQ+1t7F6EHFE8nN0gb2AdxrWCK1Dok=; b=dMlhNMG1DmK8uJrvpF1v3GLCsYgXwENYTMujltiUmspCQEnuW8REqFZLalRHaxjCt1 T+PO/fAgfZjBlf0i91ihR5QCJTVlkCk2fk0zh1DzyS9ROGHMQACMlSYL7+f+gOUPdK6C Hb6id+b2plj0JJPTRrk/VGdl230iZ/0oBAgjB3pg4pPTpO6WhEDwVLCxjKET46oE3Z0C CPCqjdJT6LUWXzhRs9m1QZozwrX6PCja2KHDpSujJQ3tazmI0I42UFINGq4nFi9LKKUn BLrEuYsKntpFiXGm/oqAijj17r7rLUI5avPHZjBLqXuB0Y4pwE9kcbDS1twldWBe0hZa LDOg== X-Gm-Message-State: AFqh2krAPj9Uh3OvDkDXDNU9OtRI/sf1qWMnx3DcoHWmnviJmZt3Bxj0 JLPYVUl8HgrIA0iKKitBvb2vCsJBJbSc68lJ X-Google-Smtp-Source: AMrXdXudZIW04MCEDLpSGSR4iaGWKEHzNaeJLXg0rKT+XaDOOv7NHKBwqbezrrUPb0w7dVMShmw4qg== X-Received: by 2002:a05:622a:258c:b0:3ab:9ef8:f7e8 with SMTP id cj12-20020a05622a258c00b003ab9ef8f7e8mr33495119qtb.42.1672810365120; Tue, 03 Jan 2023 21:32:45 -0800 (PST) Received: from localhost.localdomain (dsl-10-135-221.b2b2c.ca. [72.10.135.221]) by smtp.gmail.com with ESMTPSA id s13-20020a05620a0bcd00b006e16dcf99c8sm23682508qki.71.2023.01.03.21.32.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jan 2023 21:32:44 -0800 (PST) From: Maxim Cournoyer To: 59761@debbugs.gnu.org Subject: [PATCH v5 2/2] gnu: Add u-boot-ts7970-q-2g-1000mhz-c-bootloader. Date: Wed, 4 Jan 2023 00:32:34 -0500 Message-Id: <20230104053234.4540-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230104053234.4540-1-maxim.cournoyer@gmail.com> References: <20230104053234.4540-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59761 Cc: rekado@elephly.net, Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/bootloader/u-boot.scm (u-boot-ts7970-q-2g-1000mhz-c-bootloader): New variable. --- (no changes since v4) Changes in v4: - Rebase on top of #60224 and master gnu/bootloader/u-boot.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index 6cad33b741..65d7923465 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017, 2019 Mathieu Othacehe ;;; Copyright © 2020 Julien Lepiller ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,6 +43,7 @@ (define-module (gnu bootloader u-boot) u-boot-puma-rk3399-bootloader u-boot-rock64-rk3328-bootloader u-boot-rockpro64-rk3399-bootloader + u-boot-ts7970-q-2g-1000mhz-c-bootloader u-boot-wandboard-bootloader)) (define install-u-boot @@ -127,6 +129,12 @@ (define install-rockpro64-rk3399-u-boot (define install-pinebook-pro-rk3399-u-boot install-rockpro64-rk3399-u-boot) +(define install-u-boot-ts7970-q-2g-1000mhz-c-u-boot + #~(lambda (bootloader device mount-point) + (let ((u-boot.imx (string-append bootloader "/libexec/u-boot.imx")) + (install-dir (string-append mount-point "/boot"))) + (install-file u-boot.imx install-dir)))) + ;;; @@ -255,3 +263,13 @@ (define u-boot-pinebook-pro-rk3399-bootloader (inherit u-boot-bootloader) (package u-boot-pinebook-pro-rk3399) (disk-image-installer install-pinebook-pro-rk3399-u-boot))) + +(define u-boot-ts7970-q-2g-1000mhz-c-bootloader + ;; This bootloader doesn't really need to be installed, as it is read from + ;; an SPI memory chip, not the SD card. It is copied to /boot/u-boot.imx + ;; for convenience and should be manually flashed at the U-Boot prompt. + (bootloader + (inherit u-boot-bootloader) + (package u-boot-ts7970-q-2g-1000mhz-c) + (installer install-u-boot-ts7970-q-2g-1000mhz-c-u-boot) + (disk-image-installer #f))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 04 00:34:47 2023 Received: (at 59761) by debbugs.gnu.org; 4 Jan 2023 05:34:47 +0000 Received: from localhost ([127.0.0.1]:47324 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCwQJ-0000nn-Cg for submit@debbugs.gnu.org; Wed, 04 Jan 2023 00:34:47 -0500 Received: from mail-qt1-f172.google.com ([209.85.160.172]:42921) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCwQH-0000nW-PP for 59761@debbugs.gnu.org; Wed, 04 Jan 2023 00:34:46 -0500 Received: by mail-qt1-f172.google.com with SMTP id i20so26479738qtw.9 for <59761@debbugs.gnu.org>; Tue, 03 Jan 2023 21:34:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=NXoT64m3Q/rLbk+uuylfgvpbnUNnWP+rWfHhkWICqv4=; b=cRXBteWtrX3RMJkXcR66wSLq2fKnlajvxV2xmE2qNRdE5oEey8gAzDq46AeMMAbw4H VKpun8e1wlIv8QW5VsH07Lo4Xn9apEw2ysCLDj54zbCIIHAcbG5B0Iqy40eILn42o7tL 36dKxK710YF4JhzJAczrYAThsL/DHY7zwwa0j/KVoKZTRrD/7cA96HnOJst7YSkJ4QsZ 7HH+ykUoQDSphsi9sjtPm5lDIxuDmdxiMAK8kkTJhXC2+xTP299snmpn8rTc8AFmi8Ec Rd7Yu2MkkcS0gUD+Ao8mij6qhb8KBUUVFX0SzIY6NlCBzfFvspqI0EJfpkPOslTXfW0j sCzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=NXoT64m3Q/rLbk+uuylfgvpbnUNnWP+rWfHhkWICqv4=; b=T7RdVf9NaOHXv3475+nPCI7+bgm0EiGSVOJcZmVuwXv9+zvcpkw3njfSCewrYWkmq/ rLp8sEezVnbjW0Krn4XkUyCKbT0RxVFtCEt2B8LrSmXSqLHqlwfIWEgSF5ZcBRgpD+56 aa1erTckEZuB/L3FyDS4g6QajXaVJ5Qcm4L+hkq2/35dS3osSDQr8MArRuAtzlkzBVOs Ci213eHM3tOmGE0pRUsV2abUQzNskwcnhbYBZ1bbBvtQCdP0oSwOAkRyKwunKFAsym3T vWNQlxF8G5My/ppgZbejVo/JsHh3uy+affVf36XcxtEbeXICo9SHfLve8UWfN13YotUV SF3Q== X-Gm-Message-State: AFqh2krOHlRFZbi+yN2QykfY9KGSJykNGExINCas1zBkdlNNybxSeWa8 NQNesRLPriYF2EBeK7K/1eGCwAgG8C+98NkD X-Google-Smtp-Source: AMrXdXv8NpSgr7v6SGXwEFgrb7DLwTlWAfjXoBkv2+AzMjQ5YpzY+an0AJGxv8eb0Vh1DkgZ+Wfi+Q== X-Received: by 2002:ac8:544d:0:b0:3a7:fc75:22c6 with SMTP id d13-20020ac8544d000000b003a7fc7522c6mr83964390qtq.33.1672810480081; Tue, 03 Jan 2023 21:34:40 -0800 (PST) Received: from hurd (dsl-10-135-221.b2b2c.ca. [72.10.135.221]) by smtp.gmail.com with ESMTPSA id u2-20020a37ab02000000b006fc92cf4703sm22807198qke.132.2023.01.03.21.34.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jan 2023 21:34:39 -0800 (PST) From: Maxim Cournoyer To: Ricardo Wurmus Subject: Re: bug#59761: [PATCH 0/2] Add u-boot-ts7970-q-2g-1000mhz-c. References: <20221202052903.10475-1-maxim.cournoyer@gmail.com> <871qoi9f0b.fsf@elephly.net> <87ilhnvsqr.fsf_-_@gmail.com> Date: Wed, 04 Jan 2023 00:34:38 -0500 In-Reply-To: <87ilhnvsqr.fsf_-_@gmail.com> (Maxim Cournoyer's message of "Tue, 03 Jan 2023 23:17:00 -0500") Message-ID: <87a62yx3pt.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59761 Cc: 59761@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Maxim Cournoyer writes: >> For something as >> long as the replacements in this package consider using a patch file >> instead. This has the added advantage of failing the build when the >> patch cannot be applied cleanly. > > I agree that a patch would be most suitable here, especially that if > something breaks, if would likely be silent (unlikely to be caught at > build time). I'll extract this as a patch. After re-diving into the code, I opted to kept it as a substitution given it affects multiple config files in the same way, and would make a large, redundant patch. I cleaned it up per your suggestions (see v5). -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 04 02:37:37 2023 Received: (at 59761) by debbugs.gnu.org; 4 Jan 2023 07:37:38 +0000 Received: from localhost ([127.0.0.1]:47544 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCyLB-0006pY-HT for submit@debbugs.gnu.org; Wed, 04 Jan 2023 02:37:37 -0500 Received: from sender4-of-o50.zoho.com ([136.143.188.50]:21071) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCyL5-0006pM-Dv for 59761@debbugs.gnu.org; Wed, 04 Jan 2023 02:37:35 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1672817848; cv=none; d=zohomail.com; s=zohoarc; b=PKnL+a6/KtZOO/JIV/yWcQ/fMi9uicgPUqDUFaRhsh14SEoko7Z/ViHVlYoJNXRWg7ZXYo7N3ST4aZcAbmBiCaIxHek7BA8rKpZpgT+jGvSQax1g7ZSGxVYSkiuDPvWEjQoQ05lyr4Ccu04+GWSWne4royZpZjjX+GwNYhbFAps= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672817848; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=GdGrVMRN/gFW2VJ7uyKCQyDmWWV3toT/vlKKseFTDkE=; b=JyIeZ8HKZnyWJZJNQg3k95zDIgXjx3qPeAWS/CDo7LOQHWMXKM3kVNJmCSCz9bcNzEjG7RfwvZFb12Q6WElphceVoA7CqbiJE74cF78QZlHFEiqRhjdApvqOciPjPBkhs3nc4o2hKCmBJXYBewobmhgskkT5JP/KSodkNJR4o1M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1672817848; s=zoho; d=elephly.net; i=rekado@elephly.net; h=References:From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:In-reply-to:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=GdGrVMRN/gFW2VJ7uyKCQyDmWWV3toT/vlKKseFTDkE=; b=LDhElfC+LAb6YNDO6icrpGQeeESlwNzQq0omVq7sDc6lukHUB4SzAMv/HAeo+AtP MgnFOddwKt1fqg2wNsp9Ae6yFW/IRM40c8Jrs0/jk9b/YO2fTYS8QUo2E8O1A5RqTws 2VAeSx2LQGC5G6x8DVD9HgA+jXfwFSyY4nRMia5c= Received: from localhost (75-111-142-46.pool.kielnet.net [46.142.111.75]) by mx.zohomail.com with SMTPS id 1672817846967908.5130747051358; Tue, 3 Jan 2023 23:37:26 -0800 (PST) References: <20221202052903.10475-1-maxim.cournoyer@gmail.com> <871qoi9f0b.fsf@elephly.net> <87ilhnvsqr.fsf_-_@gmail.com> User-agent: mu4e 1.8.13; emacs 28.2 From: Ricardo Wurmus To: Maxim Cournoyer Subject: Re: bug#59761: [PATCH 0/2] Add u-boot-ts7970-q-2g-1000mhz-c. Date: Wed, 04 Jan 2023 08:35:51 +0100 In-reply-to: <87ilhnvsqr.fsf_-_@gmail.com> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Message-ID: <87fscq4uod.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59761 Cc: 59761@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > PS: I had also missed that email; please keep me in CC in all your > replies :-). Oh, that=E2=80=99s odd. I=E2=80=99m replying =E2=80=9Cfrom scratch=E2=80= =9D going just by the bug number in issues.guix.gnu.org; it doesn=E2=80=99t expose your email address= in a convenient way, so I usually just grab the issue number and write an email. Shouldn=E2=80=99t debbugs Cc you when receiving comments on your patch submission? --=20 Ricardo From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 04 09:46:28 2023 Received: (at 59761) by debbugs.gnu.org; 4 Jan 2023 14:46:29 +0000 Received: from localhost ([127.0.0.1]:48039 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pD51x-0005ql-QD for submit@debbugs.gnu.org; Wed, 04 Jan 2023 09:46:28 -0500 Received: from mail-qt1-f173.google.com ([209.85.160.173]:35520) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pD51v-0005qX-Nb for 59761@debbugs.gnu.org; Wed, 04 Jan 2023 09:46:12 -0500 Received: by mail-qt1-f173.google.com with SMTP id h26so27330795qtu.2 for <59761@debbugs.gnu.org>; Wed, 04 Jan 2023 06:46:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=rAI1qbA5WtTPUiRREeydOTdXAqCgjDvB/MrDEWAfVFo=; b=CsvyGCyAWshoB04T8X2cb9srGND2VKKD4kOQxHryrjlbhQDQ7Fdci/cqnPIEMgA6Q+ Dc+GdwvsAuaaBRPmpS2ThD6kU3ekzrIDOr+LdaYY5AKnuEkqauhg8Nod9kaykoxQGUDS 5i6u7c6JmFeolD2tSePNU/lQ6tov0usjb2UTM2W6aCCODWoStm3K+kRFV1oGmTFYS9Q9 U671LS5L07ITHgJCNXgYcqjGNvjWNR88dr3Uyvq9HZekJCrhif/87b5/gcnWl5L/l0qg ay7G74YmVrft1b6RFEalpXEZND+hTXUDrM6klZJOxpTS9XjNiQlq72bj5YXD14qF4NQu BtvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=rAI1qbA5WtTPUiRREeydOTdXAqCgjDvB/MrDEWAfVFo=; b=aXptX54wC3bCnvlWViPPdXyy2bT2PT9RJYlKRRv9dDAz/XlfoRy9JdNUD3aMJRZIqk o/t7bskv5ZskGQssbUW64hebhAYbBWdD+GInYTOr2m1YGpSTCZzQZwzsw+fk3D/gC2sf EvilnNgc4qdb9Jkynlf+L2VPJi9UYkRaA8+8BsTHsAesk8HoOqF2ajPCUREBFz0X9P54 KSWU1uLmRzVCfniF2H5DDz2xu2pFcfmuNxcE+NXOT0IIILTGvaPh/N01oHjcdOTRQHsk KdxCsxq1/fqOhZvOHoa9PZPe4ENP+dT8gzmAya25vLnrlrAxenp/12G3sLVkz+NfLwFl PUbQ== X-Gm-Message-State: AFqh2koKStmxIrB8pMZIkvLjyozI+ANStF2hLtoT+S1YD09ujs4gJ3a+ /yvWrLrOM10YAtKmT4r8yjaZe9RSIGent8FC X-Google-Smtp-Source: AMrXdXuSTubVyNkvCK1z+CRrqhWDIWx9rfvVIhsVq+aL/FdlWElJBu2K3W6BhQI1Q1F+WTlMh44bdA== X-Received: by 2002:ac8:6686:0:b0:3a8:d1e:9bd0 with SMTP id d6-20020ac86686000000b003a80d1e9bd0mr67408062qtp.67.1672843565957; Wed, 04 Jan 2023 06:46:05 -0800 (PST) Received: from hurd (dsl-10-135-221.b2b2c.ca. [72.10.135.221]) by smtp.gmail.com with ESMTPSA id t22-20020ac87616000000b003a82ca4e81csm20489387qtq.80.2023.01.04.06.46.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jan 2023 06:46:05 -0800 (PST) From: Maxim Cournoyer To: Ricardo Wurmus Subject: Re: bug#59761: [PATCH 0/2] Add u-boot-ts7970-q-2g-1000mhz-c. References: <20221202052903.10475-1-maxim.cournoyer@gmail.com> <871qoi9f0b.fsf@elephly.net> <87ilhnvsqr.fsf_-_@gmail.com> <87fscq4uod.fsf@elephly.net> Date: Wed, 04 Jan 2023 09:46:04 -0500 In-Reply-To: <87fscq4uod.fsf@elephly.net> (Ricardo Wurmus's message of "Wed, 04 Jan 2023 08:35:51 +0100") Message-ID: <875ydmwe6r.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59761 Cc: 59761@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Ricardo, Ricardo Wurmus writes: >> PS: I had also missed that email; please keep me in CC in all your >> replies :-). > > Oh, that=E2=80=99s odd. I=E2=80=99m replying =E2=80=9Cfrom scratch=E2=80= =9D going just by the bug > number in issues.guix.gnu.org; it doesn=E2=80=99t expose your email addre= ss in a > convenient way, so I usually just grab the issue number and write an > email. > > Shouldn=E2=80=99t debbugs Cc you when receiving comments on your patch > submission? It would be nice if it did, but I don't think it does. Also, the 'X-Debbugs-Cc' header used in teams.scm doesn't seem to cause an actual CC; I think it'd just cause someone not already subscribed to the guix-patches mailing list to be sent an email. I think it'd be better to simply use git-send-email's '--cc', or both. My Gnus email filter is based on the Return-Path: --8<---------------cut here---------------start------------->8--- (nnimap-split-methods ;; Filter guix mailing lists based on Return (("list.\\1" "^Return-Path: <\\(.*\\)-bounces.*@\\(non\\)?gnu.org>") ("list.\\1" "^Return-Path: <\\(.*\\)-bounces.*@lists.denx.de>") ("list.\\1" "^Return-Path: <\\(.*\\)-owner@vger.kernel.org>") ("INBOX" ""))) --8<---------------cut here---------------end--------------->8--- I think when Cc: is used in an email, it causes the Return-Path to be that of the person sending the email rather than mailman's email, which is what the above filter expects. --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 18 21:30:59 2023 Received: (at 59761-done) by debbugs.gnu.org; 19 Jan 2023 02:30:59 +0000 Received: from localhost ([127.0.0.1]:42197 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIKhe-0005K5-ND for submit@debbugs.gnu.org; Wed, 18 Jan 2023 21:30:58 -0500 Received: from mail-qt1-f169.google.com ([209.85.160.169]:41927) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIKhc-00056F-Qf for 59761-done@debbugs.gnu.org; Wed, 18 Jan 2023 21:30:57 -0500 Received: by mail-qt1-f169.google.com with SMTP id d16so555101qtw.8 for <59761-done@debbugs.gnu.org>; Wed, 18 Jan 2023 18:30:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=I8h+6ZEGFWHrBEPlVSoBecbyi5e5gWlQMKmICS1EkqU=; b=m/qKtrvIdI6RiIYfo54TfU/upDZXxQMXLkhvyLI9BITRYJwXiipxH2toeyimBabAwQ /UYNGddeU2StvlcVLxaViZpNWPmiyy576gN/gXniE3ujct0CiKH9uzBVPkq9sjx4e/ZI D1VQqz0kfuzh0gpX8EBLAmOGGUx7ExZtKrKx/jFbE21xXjGx/97+45Eb0coRsSVr9+m2 Oyr26SIx4E7gvQj6Qw8e+WTTS/Ca6SS16lZlGX5zTuZikHRCt1dRi1Odz5MWsd9NA8gM ikcza0ulmbOio0ZtKz4mJWAkKZITprS2yNkgWsJg1hyS+vGycg8vu1Y0YROYObadu7nG XAxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=I8h+6ZEGFWHrBEPlVSoBecbyi5e5gWlQMKmICS1EkqU=; b=u4q+ompDwM9zXtJ3Qv+Ox4/bLo+kiXTOgMczEUPl5G3K/h8bETsxgtqAyYgsmeSSSl 8lo5GgEudZ6zYgiFIEIDcDZctFeua/qeg9l6Y/aOq1W4SCvvfyRbDb25L50QTB0oUgNL O5rtTwG6NUX4TfsJe4mFir62eDkMGrFHLpt/dDLRC8KDy4FPU3+R7XpN+XZwz24Ch/e5 T9/mAOxjqTin8I08kyQDOx3F5pszA+uFSOwZ0Dlte3h437gRRiHxZ4NS5Qn4y3LQqGAc Y49OCl2ckamcSDo31LPG+PTH+OltukTWjWtWHk4QzYBH4pJo4KqXO9Bnp7bRLCGoTigq ca8w== X-Gm-Message-State: AFqh2kqB9ksjgolr724ulEiX2PQQaF4rwA5Nal1CPLGou4Iepsas2zn9 d6NzMiXECm1Buz5IDvZRA2o= X-Google-Smtp-Source: AMrXdXucK2yodbwFtKuLV4CewOcm/K/TFj198admfwPM/XX9EqlurVozkzBIqAvsx0/v7BunGDaSGA== X-Received: by 2002:ac8:4c84:0:b0:3b4:d5be:a2e0 with SMTP id j4-20020ac84c84000000b003b4d5bea2e0mr11705055qtv.20.1674095451014; Wed, 18 Jan 2023 18:30:51 -0800 (PST) Received: from hurd ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id fu28-20020a05622a5d9c00b003a7f3c4dcdfsm18356342qtb.47.2023.01.18.18.30.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 18:30:50 -0800 (PST) From: Maxim Cournoyer To: 59761-done@debbugs.gnu.org Subject: Re: bug#59761: [PATCH 0/2] Add u-boot-ts7970-q-2g-1000mhz-c. References: <20230104053234.4540-1-maxim.cournoyer@gmail.com> <20230104053234.4540-2-maxim.cournoyer@gmail.com> Date: Wed, 18 Jan 2023 21:30:49 -0500 In-Reply-To: <20230104053234.4540-2-maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Wed, 4 Jan 2023 00:32:34 -0500") Message-ID: <874jsndzmu.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59761-done Cc: rekado@elephly.net X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Maxim Cournoyer writes: > * gnu/bootloader/u-boot.scm (u-boot-ts7970-q-2g-1000mhz-c-bootloader): New > variable. > > --- > > (no changes since v4) > > Changes in v4: > - Rebase on top of #60224 and master > > gnu/bootloader/u-boot.scm | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) Now applied! -- Thanks, Maxim From unknown Sun Jun 22 00:38:43 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 16 Feb 2023 12:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator