From patchwork Mon May 12 12:10:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cayetano Santos X-Patchwork-Id: 42549 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 33ABE27BC4B; Mon, 12 May 2025 13:18:18 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, 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 914A927BC4A for ; Mon, 12 May 2025 13:18:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uES6M-0000AM-S9; Mon, 12 May 2025 08:17:48 -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 1uES5j-00004q-K1 for guix-patches@gnu.org; Mon, 12 May 2025 08:17:09 -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 1uES5j-00024V-5R for guix-patches@gnu.org; Mon, 12 May 2025 08:17:07 -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:Subject; bh=KYV1nmBBxbTst15/U/AKtNDVATW0zh+Q+Wi8evLmPp8=; b=tDF6UviR9Vrdg3X5zAsM3QkXVz/V3sp3ezPsGifBJSuKIPNUUdNPBcjbeeXy8l46CSqWWfBfrWSsxn6P98HJpW7rTuGvACFWUrjnP7M1fUdNps/ZVvFAgyZ3c3zASspr8ym9BCA1vz7ARRfRDoP56A0t3Ox28p3d53xcKUNsZZgoCqJc0r5MCpaAsBAB44B/6WJ9iTVcEi8hjS4QNN1anUQiZ5LMyYZmpqV6oxwuVIGRWirFSWdrfxPZz/49QX0isCmXpW2NXsUD1aiW2RPitNgPpLwRhaekHp1czsPOsL1u5b7wcvSkDFwWjtcL1ZTUVIfRfdnCkLmeQFvF7+lUmA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uES5e-0000zn-LC; Mon, 12 May 2025 08:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78390] [PATCH electronics-team] gnu: nextpnr: Add ecp5 and himbaechel architectures. 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, 12 May 2025 12:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78390@debbugs.gnu.org Cc: Cayetano Santos , Cayetano Santos , Ekaitz Zarraga , Gabriel Wicki , Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Cayetano Santos , Ekaitz Zarraga , Gabriel Wicki , Maxim Cournoyer Received: via spool by submit@debbugs.gnu.org id=B.17470521923742 (code B ref -1); Mon, 12 May 2025 12:17:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 May 2025 12:16:32 +0000 Received: from localhost ([127.0.0.1]:51054 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uES59-0000yH-8w for submit@debbugs.gnu.org; Mon, 12 May 2025 08:16:31 -0400 Received: from lists.gnu.org ([2001:470:142::17]:41156) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uES52-0000xW-ST for submit@debbugs.gnu.org; Mon, 12 May 2025 08:16:25 -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 1uES4t-00083y-0E for guix-patches@gnu.org; Mon, 12 May 2025 08:16:15 -0400 Received: from latitanza.investici.org ([82.94.249.234]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uES4p-0001wy-Bf for guix-patches@gnu.org; Mon, 12 May 2025 08:16:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org; s=stigmate; t=1747052157; bh=KYV1nmBBxbTst15/U/AKtNDVATW0zh+Q+Wi8evLmPp8=; h=From:To:Cc:Subject:Date:From; b=ImioQ4wpIe464vQPXN7HYKbLDyM/+64pYzBxWQ317t9okDuA+vaH1iosxPB1jOgWM VjI+TOIbW3Ib5Yj83lH/vJOoaWrDaT4w6cKuuuX0PLaeb+0loqZcL+DpHLhsbutd08 l++q43y0drOTEEQDBfJhrW5HDtZllYrslixjncj4= Received: from mx3.investici.org (unknown [127.0.0.1]) by latitanza.investici.org (Postfix) with ESMTP id 4Zwz8s6XSvzGp8m; Mon, 12 May 2025 12:15:57 +0000 (UTC) Received: from [82.94.249.234] (mx3.investici.org [82.94.249.234]) (Authenticated sender: cayetano.santos@inventati.org) by localhost (Postfix) with ESMTPSA id 4Zwz8s5CWLzGp95; Mon, 12 May 2025 12:15:57 +0000 (UTC) Date: Mon, 12 May 2025 14:10:33 +0200 Message-ID: <279f0c297865b8963b03dd173d171d4d3fe2eaa7.1747051833.git.csantosb@inventati.org> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=82.94.249.234; envelope-from=csantosb@inventati.org; helo=latitanza.investici.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 --- [arguments] <#:configure-flags>: Add Add ecp5 and himbaechel. <#:phases> {get-prjbeyond-db}: New phase. {unbundle-sanitizers-cmake}: Simplify lambda. [native-inputs]: Add prjtrellis. gnu/packages/fpga.scm | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) base-commit: e4e43cebbacbbb7982d08f691636f3234fd60184 -- 2.49.0 diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 2019700d72..4d767340cb 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -54,6 +54,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 gawk) @@ -408,18 +409,36 @@ (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" ;gowin requires python-apycula. + "-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 + (add-after 'unpack 'get-prjbeyond-db + (lambda _ + (copy-recursively + #$(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yosyshq-GmbH/prjbeyond-db/") + (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 @@ -436,6 +455,7 @@ (define-public nextpnr corrosion eigen icestorm + prjtrellis pybind11 python qtbase-5