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: 25b280dba10e
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: 5889e626680f
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Aug 21, 2019

  1. vendor: style. NFC.

    whitequark committed Aug 21, 2019
    Copy the full SHA
    531040d View commit details
  2. vendor.lattice_ice40: remove --placer heap default option.

    It is not the place of nMigen to decide on this default, since both
    SA and HeAP have valid uses that are not covered by the other.
    whitequark committed Aug 21, 2019
    Copy the full SHA
    5889e62 View commit details
Showing with 12 additions and 13 deletions.
  1. +3 −3 nmigen/vendor/lattice_ecp5.py
  2. +3 −4 nmigen/vendor/lattice_ice40.py
  3. +1 −1 nmigen/vendor/xilinx_7series.py
  4. +5 −5 nmigen/vendor/xilinx_spartan_3_6.py
6 changes: 3 additions & 3 deletions nmigen/vendor/lattice_ecp5.py
Original file line number Diff line number Diff line change
@@ -23,9 +23,9 @@ class LatticeECP5Platform(TemplatedPlatform):
* ``synth_opts``: adds options for ``synth_ecp5`` Yosys command.
* ``script_after_read``: inserts commands after ``read_ilang`` in Yosys script.
* ``script_after_synth``: inserts commands after ``synth_ecp5`` in Yosys script.
* ``yosys_opts``: adds extra options for Yosys.
* ``nextpnr_opts``: adds extra options for nextpnr.
* ``ecppack_opts``: adds extra options for ecppack.
* ``yosys_opts``: adds extra options for ``yosys``.
* ``nextpnr_opts``: adds extra options for ``nextpnr-ecp5``.
* ``ecppack_opts``: adds extra options for ``ecppack``.
Build products:
* ``{{name}}.rpt``: Yosys log.
7 changes: 3 additions & 4 deletions nmigen/vendor/lattice_ice40.py
Original file line number Diff line number Diff line change
@@ -23,9 +23,8 @@ class LatticeICE40Platform(TemplatedPlatform):
* ``synth_opts``: adds options for ``synth_ice40`` Yosys command.
* ``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 for nextpnr;
default options: ``--placer heap``.
* ``yosys_opts``: adds extra options for ``yosys``.
* ``nextpnr_opts``: adds extra options for ``nextpnr-ice40``.
Build products:
* ``{{name}}.rpt``: Yosys log.
@@ -107,7 +106,7 @@ class LatticeICE40Platform(TemplatedPlatform):
r"""
{{get_tool("nextpnr-ice40")}}
{{quiet("--quiet")}}
{{get_override("nextpnr_opts")|default(["--placer","heap"])|options}}
{{get_override("nextpnr_opts")|options}}
--log {{name}}.tim
{{platform._nextpnr_device_options[platform.device]}}
--package
2 changes: 1 addition & 1 deletion nmigen/vendor/xilinx_7series.py
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ class Xilinx7SeriesPlatform(TemplatedPlatform):
* ``script_before_bitstream``: inserts commands before ``write_bitstream`` in Tcl script.
* ``script_after_bitstream``: inserts commands after ``write_bitstream`` in Tcl script.
* ``add_constraints``: inserts commands in XDC file.
* ``vivado_opts``: adds extra options for Vivado.
* ``vivado_opts``: adds extra options for ``vivado``.
Build products:
* ``{{name}}.log``: Vivado log.
10 changes: 5 additions & 5 deletions nmigen/vendor/xilinx_spartan_3_6.py
Original file line number Diff line number Diff line change
@@ -26,11 +26,11 @@ class XilinxSpartan3Or6Platform(TemplatedPlatform):
Available overrides:
* ``script_after_run``: inserts commands after ``run`` in XST script.
* ``add_constraints``: inserts commands in UCF file.
* ``xst_opts``: adds extra options for XST.
* ``ngdbuild_opts``: adds extra options for NGDBuild.
* ``map_opts``: adds extra options for MAP.
* ``par_opts``: adds extra options for PAR.
* ``bitgen_opts``: adds extra and overrides default options for BitGen;
* ``xst_opts``: adds extra options for ``xst``.
* ``ngdbuild_opts``: adds extra options for ``ngdbuild``.
* ``map_opts``: adds extra options for ``map``.
* ``par_opts``: adds extra options for ``par``.
* ``bitgen_opts``: adds extra and overrides default options for ``bitgen``;
default options: ``-g Compress``.
Build products: