From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Mon, 4 Apr 2022 18:50:52 +0000 (+0100)
Subject: fixup nextpnr-xilinx directory locations to match
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=97c5cd1bb02e34ceb6739fb1f13ad5b984adb60c;p=nmigen.git

fixup nextpnr-xilinx directory locations to match
install locations of nextpnr-xilinx with a make PREFIX of
/usr/local/nextpnr-xilinx
---

diff --git a/nmigen/vendor/xilinx.py b/nmigen/vendor/xilinx.py
index 769b9ec..98b10bd 100644
--- a/nmigen/vendor/xilinx.py
+++ b/nmigen/vendor/xilinx.py
@@ -474,10 +474,10 @@ class XilinxPlatform(TemplatedPlatform):
     # go beyond 23-25 CARRY4 blocks in length (appx 92-96 bit add/sub/cmp)
     _yosys_nextpnr_command_templates = [
         r"""
-        DB_DIR={{get_override("nextpnr_dir")|default("/usr/share/nextpnr")}}/prjxray-db
+        DB_DIR={{get_override("nextpnr_dir")|default("/usr/local/nextpnr-xilinx")}}/database
         """,
         r"""
-        CHIPDB_DIR={{get_override("nextpnr_dir")|default("/usr/share/nextpnr")}}/xilinx-chipdb
+        CHIPDB_DIR={{get_override("nextpnr_dir")|default("/usr/local/nextpnr-xilinx/share/")}}/xilinx
         """,
         r"""
         PART={{platform._yosys_nextpnr_part_map.get(platform._part, platform._part)}}