Merge branch 'master' of ssh://git.libre-riscv.org:922/ls2

[ls2.git] / src / ls2.py

diff --git a/src/ls2.py b/src/ls2.py
index f1efb8f58b784879db2cd9b19f14545043830d60..9aef11adaab4556d0161004b84cd53acca97ca20 100644 (file)
--- a/src/ls2.py
+++ b/src/ls2.py
@@ -871,7 +871,7 @@ def build_platform(fpga, firmware):
         clk_freq = 50e6
         dram_clk_freq = 100e6
     if fpga == 'arty_a7':
-        clk_freq = 24e6 # urrr "working" with the QSPI core (25 mhz does not)
+        clk_freq = 27.0e6 # urrr "working" with the QSPI core (25 mhz does not)
     if fpga == 'ulx3s':
         clk_freq = 40.0e6
     if fpga == 'orangecrab':
@@ -1104,6 +1104,12 @@ def build_platform(fpga, firmware):
         #os.environ['NMIGEN_synth_opts'] = '-abc9'
         os.environ['NMIGEN_synth_opts'] = '-nowidelut'
 
+    if toolchain == 'yosys_nextpnr':
+        # add --seed 2 to arty a7 compile-time options
+        freq = clk_freq/1e6
+        os.environ['NMIGEN_nextpnr_opts'] = '--seed 3 --freq %.1f' % freq
+        os.environ['NMIGEN_nextpnr_opts'] += ' --timing-allow-fail'
+
     if platform is not None:
         # build and upload it
         if fpga == 'isim':