From: Cesar Strauss <cesar.strauss@inpe.br>
Date: Tue, 19 Mar 2024 21:44:49 +0000 (-0300)
Subject: Switch nextpnr-xilinx to the openXC7 fork
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c0a97a15c900c6752cd9e1cfc3d83b1807b6e7bc;p=dev-env-setup.git

Switch nextpnr-xilinx to the openXC7 fork

This fixes 2,5V leds on the Nexys Video.
openXC7 seems more stable that the upstream project at this time.
Use the latest released version (0.7.0).
See: https://bugs.libre-soc.org/show_bug.cgi?id=1004#c13
---

diff --git a/nextpnr-xilinx-install b/nextpnr-xilinx-install
index d9469f9..66b595a 100755
--- a/nextpnr-xilinx-install
+++ b/nextpnr-xilinx-install
@@ -13,7 +13,10 @@ apt-get install -y libcurl3-gnutls git git-man
 
 git clone https://github.com/f4pga/prjxray.git
 git clone https://github.com/SymbiFlow/prjxray-db.git
-git clone https://github.com/gatecat/nextpnr-xilinx.git
+# switch to the nextpnr-xilinx source provided by the openXC7 project
+# it seems more stable than upstream, for now
+# See: https://bugs.libre-soc.org/show_bug.cgi?id=1004#c13
+git clone https://github.com/openXC7/nextpnr-xilinx.git
 
 ## Steps to compile prjxray
 
@@ -22,7 +25,7 @@ git clone https://github.com/gatecat/nextpnr-xilinx.git
 apt-get install -y build-essential make cmake python3 python3-setuptools \
                    python3-dev python3-numpy cython3 python3-pip
 
-pip3 install textx
+pip3 install textx sortedcontainers
 
 # this really doesn't work properly, antlr is still not correctly
 # detected, (missing ANTLRconfig.cmake) but at least fasm falls back
@@ -39,7 +42,7 @@ cd ..
 ### Build prjxray
 
 cd prjxray
-git checkout 18b92012afe2b03f3f975a78c4372c74b60dca0c
+git checkout 76401bd93e493fd5ff4c2af4751d12105b0f4f6d
 git submodule update --init --recursive
 mkdir build; cd build
 cmake -DCMAKE_INSTALL_PREFIX=/usr/local/nextpnr-xilinx ..
@@ -72,10 +75,10 @@ apt-get install -y libboost-thread-dev libboost-iostreams-dev \
  libboost-program-options-dev libeigen3-dev libboost-python-dev \
  libboost-filesystem-dev
 
-### Build nextpnr-xilinx
+### Build nextpnr-xilinx from release 0.7.0 of openXC7
 
 cd nextpnr-xilinx
-git checkout 565588a69ea95a52f7c7592f4ed81d9bef6cfb60
+git checkout 1c57f511f80945a709d1d43478d39ad0b6cd51d2
 git submodule init
 git submodule update
 cmake -DARCH=xilinx -DBUILD_GUI=OFF \