Fix PLLE2 techmap

Upstream issue: https://github.com/SymbiFlow/symbiflow-arch-defs/issues/1991

3 files changed, 57 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 63ac77da41fa..ec2bd427d610 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,6 +12,7 @@ pkgbase = symbiflow-arch-defs-nightly-bin
 	noextract = synth.tcl.patch
 	noextract = wrappers.patch
 	noextract = synth.tcl-disable-abc9.patch
+	noextract = 0001-Fix-PLLE2_BASE-techmap.patch
 	noextract = symbiflow-arch-defs-install-9669b55e.tar.xz
 	noextract = symbiflow-arch-defs-xc7a50t_test-9669b55e.tar.xz
 	noextract = symbiflow-arch-defs-xc7a100t_test-9669b55e.tar.xz
@@ -23,6 +24,7 @@ pkgbase = symbiflow-arch-defs-nightly-bin
 	source = synth.tcl.patch
 	source = wrappers.patch
 	source = synth.tcl-disable-abc9.patch
+	source = 0001-Fix-PLLE2_BASE-techmap.patch
 	source = https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/190/20210318-000555/symbiflow-arch-defs-install-9669b55e.tar.xz
 	source = https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/190/20210318-000555/symbiflow-arch-defs-xc7a50t_test-9669b55e.tar.xz
 	source = https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/190/20210318-000555/symbiflow-arch-defs-xc7a100t_test-9669b55e.tar.xz
@@ -34,6 +36,7 @@ pkgbase = symbiflow-arch-defs-nightly-bin
 	sha256sums = 26cdf26b9adabd375b426d83d170a2376fbc8a9ad1d5c7a97f559646c341bc80
 	sha256sums = badf095978ca0d828972a7b487b235e3f6970bdb43a0b3c710abaa261cd5f10a
 	sha256sums = 9822a26f45ac0bfa556f1f3d550aad03225802740c21d0fa8c750c2358a76e04
+	sha256sums = b030be41442550e87e75b1cda575ed52e5334314c5e19219870e77c0edaaa8c9
 	sha256sums = f8608ba6c899d8439644a1dd92467d5acca3101ec9f217748fd1d8fe6762f20e
 	sha256sums = aa7499752dbe33361e28ff7b3c9f8ea05209734449f7d960f177414c1e355243
 	sha256sums = ebc9ee4710bd3ff46b7f62dc71ca88aea155573ca7a8e0f85bf37c8afcafbda9
diff --git a/0001-Fix-PLLE2_BASE-techmap.patch b/0001-Fix-PLLE2_BASE-techmap.patch
new file mode 100644
index 000000000000..20684fd5cc15
--- /dev/null
+++ b/0001-Fix-PLLE2_BASE-techmap.patch
@@ -0,0 +1,51 @@
+From 2b3762c85054cfa669558a01a64f43802707f919 Mon Sep 17 00:00:00 2001
+From: Xiretza <xiretza@xiretza.xyz>
+Date: Fri, 5 Mar 2021 11:13:46 +0100
+Subject: [PATCH] Fix PLLE2_BASE techmap
+
+---
+ xc/xc7/techmap/cells_map.v | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/xc/xc7/techmap/cells_map.v b/xc/xc7/techmap/cells_map.v
+index c43fb94d..d4d0df45 100644
+--- a/xc/xc7/techmap/cells_map.v
++++ b/xc/xc7/techmap/cells_map.v
+@@ -4142,7 +4142,7 @@ endmodule
+ module PLLE2_BASE
+ (
+ input         CLKFBIN,
+-input         CLKIN,
++input         CLKIN1,
+ 
+ output        CLKFBOUT,
+ output        CLKOUT0,
+@@ -4153,6 +4153,7 @@ output        CLKOUT4,
+ output        CLKOUT5,
+ 
+ input         RST,
++input         PWRDWN,
+ output        LOCKED
+ );
+ 
+@@ -4239,7 +4240,7 @@ output        LOCKED
+   _TECHMAP_REPLACE_
+   (
+   .CLKFBIN(CLKFBIN),
+-  .CLKIN1(CLKIN),
++  .CLKIN1(CLKIN1),
+   .CLKINSEL(1'b1),
+ 
+   .CLKFBOUT(CLKFBOUT),
+@@ -4250,7 +4251,7 @@ output        LOCKED
+   .CLKOUT4(CLKOUT4),
+   .CLKOUT5(CLKOUT5),
+ 
+-  .PWRDWN(1'b0),
++  .PWRDWN(PWRDWN),
+   .RST(RST),
+   .LOCKED(LOCKED),
+ 
+-- 
+2.31.0
+
diff --git a/PKGBUILD b/PKGBUILD
index ce15aa83961f..398c575c1754 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,6 +20,7 @@ source=("https://raw.githubusercontent.com/SymbiFlow/$_pkgbase/$_commit/COPYING"
         "synth.tcl.patch"
         "wrappers.patch"
         "synth.tcl-disable-abc9.patch"
+        "0001-Fix-PLLE2_BASE-techmap.patch"
         "$_baseurl/$_pkgbase-install-$_commit.tar.xz")
 for _d in "${_devices[@]}"; do
 	source+=("$_baseurl/$_pkgbase-${_d}_test-$_commit.tar.xz")
@@ -30,6 +31,7 @@ sha256sums=('0726ddf229165179fe21da0c97884eeddf88be32dcfc13abf9b2eced0dbafad6'
             '26cdf26b9adabd375b426d83d170a2376fbc8a9ad1d5c7a97f559646c341bc80'
             'badf095978ca0d828972a7b487b235e3f6970bdb43a0b3c710abaa261cd5f10a'
             '9822a26f45ac0bfa556f1f3d550aad03225802740c21d0fa8c750c2358a76e04'
+            'b030be41442550e87e75b1cda575ed52e5334314c5e19219870e77c0edaaa8c9'
             'f8608ba6c899d8439644a1dd92467d5acca3101ec9f217748fd1d8fe6762f20e'
             'aa7499752dbe33361e28ff7b3c9f8ea05209734449f7d960f177414c1e355243'
             'ebc9ee4710bd3ff46b7f62dc71ca88aea155573ca7a8e0f85bf37c8afcafbda9'
@@ -65,6 +67,7 @@ _package-toolchain() {
 	patch -d "$pkgdir/usr/share/symbiflow/scripts/" -p1 < "$srcdir/fix_xc7_carry.py.patch"
 	patch -d "$pkgdir/usr/share/symbiflow/scripts/xc7/" -p1 < "$srcdir/synth.tcl.patch"
 	patch -d "$pkgdir/usr/share/symbiflow/scripts/xc7/" -p1 < "$srcdir/synth.tcl-disable-abc9.patch"
+	patch -d "$pkgdir/usr/share/symbiflow/techmaps/xc7_vpr/" -p3 < "$srcdir/0001-Fix-PLLE2_BASE-techmap.patch"
 
 	sed -i "s#source \"[^\"]*/env\"#source /usr/lib/$_pkgbase/env#" "$pkgdir"/usr/bin/*
 	sed -i 's#SHARE_DIR_PATH=.*#SHARE_DIR_PATH=/usr/share/symbiflow/#' "$pkgdir/usr/bin/env"