From patchwork Thu Jun 12 10:23:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Cayetano Santos X-Patchwork-Id: 43076 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 CD78A27BC4A; Thu, 12 Jun 2025 11:27:30 +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=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EAB1427BC49 for ; Thu, 12 Jun 2025 11:27:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uPf9N-0007Up-Vx; Thu, 12 Jun 2025 06:27:14 -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 1uPf9I-0007U4-Fb for guix-patches@gnu.org; Thu, 12 Jun 2025 06:27: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 1uPf9H-0007cQ-2I for guix-patches@gnu.org; Thu, 12 Jun 2025 06:27:08 -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=yu4By8NVKB9LVe4iUuiOx3FLoepeHG/Ld7rG4e/GYFg=; b=MWkWZRugJRR/8pIjupnNKm2i0gHsw8P/3ia6l6QSBQPB5BifDZrUSc3nUwQQEBKdHUVmTTADK4GOmJ8ESYeqNMzUuTZ/IabcApjEPC92OHb/YJH9f2KcHFW+jSUOiJqbMAUHoyQ7S1weNhAY2LpWPOsHaV1y3nH3gmW11cTDRgROWrjKkf/mwr3qJ8tQ3BJINqblZ1gOuDaj31zhxAmdteaLz6C+Q0mb60neOD2tqDkK5mLn93QG18giq0JsUpHpmgJ5YSlAJvIUkf58MHMvT/8jHBsjlG89g3H/oGSBSeQ2Cvhf6wtTIELroZwiTrqXOsgRGmObjIrckFsHdyDR7w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uPf9C-0007xT-Tv; Thu, 12 Jun 2025 06:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78774] [PATCH electronics-team v4] 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: Thu, 12 Jun 2025 10:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78774 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78390@debbugs.gnu.org Cc: 78774@debbugs.gnu.org, Cayetano Santos , Ekaitz Zarraga , Gabriel Wicki , Maxim Cournoyer X-Debbugs-Original-Cc: Cayetano Santos via Guix-patches via X-Debbugs-Original-Xcc: Cayetano Santos , Ekaitz Zarraga , Gabriel Wicki , Maxim Cournoyer Received: via spool by submit@debbugs.gnu.org id=B.174972400230545 (code B ref -1); Thu, 12 Jun 2025 10:27:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jun 2025 10:26:42 +0000 Received: from localhost ([127.0.0.1]:56614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uPf8r-0007wa-PH for submit@debbugs.gnu.org; Thu, 12 Jun 2025 06:26:42 -0400 Received: from lists.gnu.org ([2001:470:142::17]:55344) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uPf8p-0007w1-72 for submit@debbugs.gnu.org; Thu, 12 Jun 2025 06:26:39 -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 1uPf8c-0006yT-JF for guix-patches@gnu.org; Thu, 12 Jun 2025 06:26:28 -0400 Received: from confino.investici.org ([2a11:7980:1::2:0]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uPf8Y-0007a8-8U for guix-patches@gnu.org; Thu, 12 Jun 2025 06:26:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org; s=stigmate; t=1749723977; bh=yu4By8NVKB9LVe4iUuiOx3FLoepeHG/Ld7rG4e/GYFg=; h=From:To:Cc:Subject:Date:From; b=AZ1ntQtb2wsaxPlA9lzwe42kmajVsAy/egLctcMgjjc5PH6JCjgQtiSlYEXCcaQeE ByfF9Uu9EqWrsmO+9J+bnhSQdLa4H8f/ulL/a8uxg+CBELXP+7UNB620u0Vd59wsnc dxYK4oIBxAaVpVIrsh7ssxw3+jgd7boeYkWAPMng= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4bHzG14qgdz10wr; Thu, 12 Jun 2025 10:26:17 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: cayetano.santos@inventati.org) by localhost (Postfix) with ESMTPSA id 4bHzG13hwSz10wj; Thu, 12 Jun 2025 10:26:17 +0000 (UTC) Date: Thu, 12 Jun 2025 12:23:40 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a11:7980:1::2:0; envelope-from=csantosb@inventati.org; helo=confino.investici.org 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, 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 From: Cayetano Santos via Guix-patches via Change-Id: Ia4b92f6cd1693b844b35949fdc23369e958e73c1 --- As prjbeyond-db now includes a free license [0], we way produce an executable for himbaechel architecture, in addition to ecp5. [0] https://github.com/YosysHQ-GmbH/prjbeyond-db/issues/2#issuecomment-2963375264 gnu/packages/fpga.scm | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) base-commit: 8730c8f3a86ef41d5b88df573fce9b6d73c23b0c -- 2.49.0 diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index c46631c6cd..3240cca92f 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,39 @@ (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 indicated in nextpnr’s + ;; README.md file + (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 +487,7 @@ (define-public nextpnr corrosion eigen icestorm + prjtrellis pybind11 python qtbase-5