From patchwork Mon May 19 09:11:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cayetano Santos X-Patchwork-Id: 42746 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6C82927BC4B; Mon, 19 May 2025 10:13:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AF89527BC49 for ; Mon, 19 May 2025 10:13:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uGwYf-000811-Jg; Mon, 19 May 2025 05:13:17 -0400 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 1uGwYa-00080l-9l for guix-patches@gnu.org; Mon, 19 May 2025 05:13:12 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uGwYZ-00050K-Rh for guix-patches@gnu.org; Mon, 19 May 2025 05:13:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=WrrYVUWTlk5yN86cUuv0q2iHDXxBkT1Gqj6XHflKxMQ=; b=rjDptzAGVkQHbIwbx0zJg1aGfU0kfTj7zHOpj2G3AAy6kf5qNKZgTVE+qrZb/r6czQbnqUBh9Gchh5SWzD9QGfOoA/kQ7afmDAKEBkMD0P9g3f54UH9o6lR07uxPo2ORAuE0iXAsNJrC20hENxkpwKizFmPDG/pfWDtfJkyJxQDRECY51rg7eS3UbE3zd02cCFUbXdsvsfF/IWQiR81tn94/GMaQw6dfJprAjfhv19s56hPMx5WPJmhNObQNTXnYNZ+ZeNymprUx542v1D0tEhK99s390q12kaFiJ8V+XfA20t/DL8rjE4ohuYOx6DE3OezXlrNU8z4hgZVmruLBlg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uGwYQ-0000bq-Is; Mon, 19 May 2025 05:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78390] [PATCH electronics-team v2] gnu: nextpnr: Add ecp5 and himbaechel architectures. References: <279f0c297865b8963b03dd173d171d4d3fe2eaa7.1747051833.git.csantosb@inventati.org> In-Reply-To: <279f0c297865b8963b03dd173d171d4d3fe2eaa7.1747051833.git.csantosb@inventati.org> Resent-From: Cayetano Santos Original-Sender: "Debbugs-submit" Resent-CC: csantosb@inventati.org, ekaitz@elenq.tech, gabriel@erlikon.ch, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 19 May 2025 09:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: 78390@debbugs.gnu.org Cc: Cayetano Santos , Cayetano Santos , Ekaitz Zarraga , Gabriel Wicki , Maxim Cournoyer X-Debbugs-Original-Xcc: Cayetano Santos , Ekaitz Zarraga , Gabriel Wicki , Maxim Cournoyer Received: via spool by 78390-submit@debbugs.gnu.org id=B78390.17476459342257 (code B ref 78390); Mon, 19 May 2025 09:13:02 +0000 Received: (at 78390) by debbugs.gnu.org; 19 May 2025 09:12:14 +0000 Received: from localhost ([127.0.0.1]:37378 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uGwXe-0000aJ-5m for submit@debbugs.gnu.org; Mon, 19 May 2025 05:12:14 -0400 Received: from devianza.investici.org ([198.167.222.108]:52175) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uGwXY-0000Zm-Kp for 78390@debbugs.gnu.org; Mon, 19 May 2025 05:12:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org; s=stigmate; t=1747645927; bh=WrrYVUWTlk5yN86cUuv0q2iHDXxBkT1Gqj6XHflKxMQ=; h=From:To:Cc:Subject:Date:From; b=BI07+JnCVg+jlxHfBuy2DiC+FwRArq2+w3fK5VOCZQuTkpvlyEvfvMCV9Ym1n2S7o Iae8cppjNWk6eO+/AWrBPnzYP+iIAS61dt5sEhWXqXr/1/feoCml+/LDJ1vA4izQlT NyVONGZ3R96goG7BBHebjlNmy1apW5CGdk10xa9c= Received: from mx2.investici.org (unknown [127.0.0.1]) by devianza.investici.org (Postfix) with ESMTP id 4b1BlW0w2gz6vJd; Mon, 19 May 2025 09:12:07 +0000 (UTC) Received: from [198.167.222.108] (mx2.investici.org [198.167.222.108]) (Authenticated sender: cayetano.santos@inventati.org) by localhost (Postfix) with ESMTPSA id 4b1BlV6Hpfz6vH7; Mon, 19 May 2025 09:12:06 +0000 (UTC) Date: Mon, 19 May 2025 11:11:18 +0200 Message-ID: <4e73f7ac01330bff25b5a95d0a3e60e0aa85d903.1747645878.git.csantosb@inventati.org> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Cayetano Santos X-ACL-Warn: , Cayetano Santos via Guix-patches X-Patchwork-Original-From: Cayetano Santos via Guix-patches via From: Cayetano Santos Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/fpga.scm (nextpnr): Add ecp5 and himbaechel architectures. Change-Id: Ia4b92f6cd1693b844b35949fdc23369e958e73c1 --- gnu/packages/fpga.scm | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) base-commit: 450a361532573a02389530a6a80b7821683ed41b -- 2.49.0 diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index c46631c6cd..ec166c9c4e 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -55,6 +55,7 @@ (define-module (gnu packages fpga) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) + #:use-module (gnu packages electronics) #:use-module (gnu packages elf) #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) @@ -437,18 +438,38 @@ (define-public nextpnr (list #:cmake cmake ;CMake 3.25 or higher is required. #:configure-flags - #~(list "-DARCH=generic;ice40" ;TODO: enable more architectures? + ;; TODO: enable more architectures? + #~(list "-DARCH=generic;ice40;ecp5;himbaechel" "-DBUILD_GUI=ON" "-DUSE_OPENMP=ON" "-DBUILD_TESTS=ON" + "-DHIMBAECHEL_UARCH=ng-ultra" + "-DHIMBAECHEL_NGULTRA_DEVICES=ng-ultra" + "-DHIMBAECHEL_PRJBEYOND_DB=/tmp/prjbeyond-db" (string-append "-DCURRENT_GIT_VERSION=nextpnr-" #$version) (string-append "-DICESTORM_INSTALL_PREFIX=" #$(this-package-input "icestorm")) + (string-append "-DTRELLIS_INSTALL_PREFIX=" + #$(this-package-input "prjtrellis")) "-DUSE_IPO=OFF") #:phases #~(modify-phases %standard-phases + ;; Required by himbaechel architecture, ng-ultra support. + (add-after 'unpack 'get-prjbeyond-db + (lambda _ + (copy-recursively + #$(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yosyshq-GmbH/prjbeyond-db/") + ;; We take latest commit, as for README.md. + (commit "06d3b424dd0e52d678087c891c022544238fb9e3"))) + (sha256 + (base32 + "17dd3cgms2fy6xvz7magdmvv92km4cqh2kz9dyjrvz5y8caqav4y"))) + "/tmp/prjbeyond-db"))) (add-after 'unpack 'unbundle-sanitizers-cmake - (lambda* (#:key inputs #:allow-other-keys) + (lambda _ (substitute* "CMakeLists.txt" ;; Use the system sanitizers-cmake module. This is made ;; necessary 'sanitizers-cmake' installing a FindPackage @@ -465,6 +486,7 @@ (define-public nextpnr corrosion eigen icestorm + prjtrellis pybind11 python qtbase-5