aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shah <dave@ds0.me>2020-09-25 09:33:55 +0100
committerGitHub <noreply@github.com>2020-09-25 09:33:55 +0100
commit587bfab2a629f8ab9bc5a101dd1d4977df55fc5b (patch)
treeef4de72ff424fb7d2e8b53b6d7cd9f5cde38ac9e
parentd9278780248e2450f4f9dab9d014a90078dbd9ba (diff)
parent84ce3ed43e91c742ef570f4928a1add7907e8ac6 (diff)
downloadnextpnr-587bfab2a629f8ab9bc5a101dd1d4977df55fc5b.tar.gz
nextpnr-587bfab2a629f8ab9bc5a101dd1d4977df55fc5b.tar.bz2
nextpnr-587bfab2a629f8ab9bc5a101dd1d4977df55fc5b.zip
Merge pull request #502 from pepijndevos/patch-1
Update generic synth script for dfflegalize changes
-rw-r--r--.cirrus/Dockerfile.ubuntu16.042
-rw-r--r--generic/synth/synth_generic.tcl1
2 files changed, 2 insertions, 1 deletions
diff --git a/.cirrus/Dockerfile.ubuntu16.04 b/.cirrus/Dockerfile.ubuntu16.04
index a1d254e3..92ab2bae 100644
--- a/.cirrus/Dockerfile.ubuntu16.04
+++ b/.cirrus/Dockerfile.ubuntu16.04
@@ -37,7 +37,7 @@ RUN set -e -x ;\
cd /usr/local/src ;\
git clone --recursive https://github.com/YosysHQ/yosys.git ;\
cd yosys ;\
- git reset --hard 292f03355a425ede48051c79d5bf619591531080 ;\
+ git reset --hard cd8b2ed4e6f9447c94d801de7db7ae6ce0976d57 ;\
make -j $(nproc) ;\
make install ;\
rm -rf /usr/local/src/yosys
diff --git a/generic/synth/synth_generic.tcl b/generic/synth/synth_generic.tcl
index e5d88e0d..72059925 100644
--- a/generic/synth/synth_generic.tcl
+++ b/generic/synth/synth_generic.tcl
@@ -14,6 +14,7 @@ yosys memory_map
yosys opt -full
yosys techmap -map +/techmap.v
yosys opt -fast
+yosys dfflegalize -cell \$_DFF_P_ 0
yosys abc -lut $LUT_K -dress
yosys clean
yosys techmap -D LUT_K=$LUT_K -map [file dirname [file normalize $argv0]]/cells_map.v