From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Mon, 9 Mar 2020 15:51:11 +0000 (+0100)
Subject: lattice/icestorm: enable DSP inference with Yosys and avoid setting SPI Flash in... 
X-Git-Tag: 24jan2021_ls180~586
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=197bdcb02654bab8798dbb83e0d51e4ee1b493e8;p=litex.git

lattice/icestorm: enable DSP inference with Yosys and avoid setting SPI Flash in deep sleep mode after configuration which prevent running ROM CPU code from SPI Flash.
---

diff --git a/litex/build/lattice/icestorm.py b/litex/build/lattice/icestorm.py
index 0f6fc68b..3555a139 100644
--- a/litex/build/lattice/icestorm.py
+++ b/litex/build/lattice/icestorm.py
@@ -40,7 +40,7 @@ def _build_pre_pack(vns, clocks):
 _yosys_template = [
     "{read_files}",
     "attrmap -tocase keep -imap keep=\"true\" keep=1 -imap keep=\"false\" keep=0 -remove keep=0",
-    "synth_ice40 {synth_opts} -json {build_name}.json -top {build_name}",
+    "synth_ice40 {synth_opts} -json {build_name}.json -top {build_name} -dsp",
 ]
 
 def _yosys_import_sources(platform):
@@ -91,7 +91,7 @@ _build_template = [
     "yosys -l {build_name}.rpt {build_name}.ys",
     "nextpnr-ice40 --json {build_name}.json --pcf {build_name}.pcf --asc {build_name}.txt \
     --pre-pack {build_name}_pre_pack.py --{architecture} --package {package}",
-    "icepack {build_name}.txt {build_name}.bin"
+    "icepack -s {build_name}.txt {build_name}.bin"
 ]
 
 def _build_script(build_template, build_name, architecture, package):