Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/nmigen
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 15e8dfe532d8
Choose a base ref
...
head repository: m-labs/nmigen
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 27063a3bd33e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Aug 4, 2019

  1. vendor.xilinx_spartan_3_6: always use -w for map/par/bitgen.

    -w stands for "override output file", and supplying user options
    should not remove it.
    whitequark committed Aug 4, 2019
    Copy the full SHA
    65da905 View commit details
  2. vendor.xilinx_spartan_3_6: set bitgen defaults to `-g Binary:Yes -g C…

    …ompress`.
    
      * `-g Binary:Yes` should be overridable.
      * `-g Compress` is a good default.
    whitequark committed Aug 4, 2019
    Copy the full SHA
    27063a3 View commit details
Showing with 8 additions and 6 deletions.
  1. +2 −2 nmigen/vendor/lattice_ice40.py
  2. +6 −4 nmigen/vendor/xilinx_spartan_3_6.py
4 changes: 2 additions & 2 deletions nmigen/vendor/lattice_ice40.py
Original file line number Diff line number Diff line change
@@ -24,8 +24,8 @@ class LatticeICE40Platform(TemplatedPlatform):
* ``script_after_read``: inserts commands after ``read_ilang`` in Yosys script.
* ``script_after_synth``: inserts commands after ``synth_ice40`` in Yosys script.
* ``yosys_opts``: adds extra options for Yosys.
* ``nextpnr_opts``: adds extra and overrides default options (``--placer heap``)
for nextpnr.
* ``nextpnr_opts``: adds extra and overrides default options for nextpnr;
default options: ``--placer heap``.
Build products:
* ``{{name}}.rpt``: Yosys log.
10 changes: 6 additions & 4 deletions nmigen/vendor/xilinx_spartan_3_6.py
Original file line number Diff line number Diff line change
@@ -138,22 +138,24 @@ def family(self):
r"""
{{get_tool("map")}}
{{verbose("-detail")}}
{{get_override("map_opts")|default(["-w"])|options}}
{{get_override("map_opts")|default([])|options}}
-w
-o {{name}}_map.ncd
{{name}}.ngd
{{name}}.pcf
""",
r"""
{{get_tool("par")}}
{{get_override("par_opts")|default(["-w"])|options}}
{{get_override("par_opts")|default([])|options}}
-w
{{name}}_map.ncd
{{name}}_par.ncd
{{name}}.pcf
""",
r"""
{{get_tool("bitgen")}}
{{get_override("bitgen_opts")|default(["-w"])|options}}
-g Binary:Yes
{{get_override("bitgen_opts")|default(["-g Binary:Yes", "-g Compress"])|options}}
-w
{{name}}_par.ncd
{{name}}.bit
"""