WIP: pnr none

olofk · Jul 2, 2019 · 0f0b4fb · 0f0b4fb
1 parent 4887cdc
commit 0f0b4fb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/edalize/icestorm.py b/edalize/icestorm.py
@@ -84,7 +84,7 @@ def configure_main(self):
             raise RuntimeError("Icestorm backend supports only one PCF file. Found {}".format(', '.join(pcf_files)))
 
         pnr = self.tool_options.get('pnr', 'arachne')
-        if not pnr in ['arachne', 'next']:
+        if not pnr in ['arachne', 'next', 'none']:
             raise RuntimeError("Invalid pnr option '{}'. Valid values are 'arachne' for Arachne-pnr or 'next' for nextpnr".format(pnr))
         # Write Makefile
         arachne_pnr_options = self.tool_options.get('arachne_pnr_options', [])
@@ -95,6 +95,7 @@ def configure_main(self):
             'pnr'                 : pnr,
             'arachne_pnr_options' : arachne_pnr_options,
             'nextpnr_options'     : nextpnr_options,
+            'default_target'      : 'json' if pnr == 'none' else 'bin',
         }
         self.render_template('icestorm-makefile.j2',
                              'Makefile',

diff --git a/edalize/templates/icestorm/icestorm-makefile.j2 b/edalize/templates/icestorm/icestorm-makefile.j2
@@ -6,7 +6,7 @@ PNR      ?= {{ pnr }}
 ARACHNE_PNR_OPTIONS := {{ arachne_pnr_options|join(' ') }}
 NEXTPNR_OPTIONS     := {{ nextpnr_options|join(' ') }}
 
-all: $(TARGET).bin
+all: $(TARGET).{{ default_target }}
 
 %.blif: %.ys
 	yosys -l yosys.log -q -s $?