From: whitequark <cz@m-labs.hk>
Date: Sun, 13 Oct 2019 21:56:40 +0000 (+0000)
Subject: vendor.lattice_ice40: use pcf files instead of pre-pack Python scripts.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=babde26d0e4e853660170a5d063927f4b68627c3;p=nmigen.git

vendor.lattice_ice40: use pcf files instead of pre-pack Python scripts.

This allows to use nextpnr-ice40 built without Python with nMigen.
Requires nextpnr revision
YosysHQ/nextpnr@8c0610e84fa6a38d3f351774bd81a32c96a91242 or newer.
---

diff --git a/nmigen/vendor/lattice_ice40.py b/nmigen/vendor/lattice_ice40.py
index 20a844c..163b48e 100644
--- a/nmigen/vendor/lattice_ice40.py
+++ b/nmigen/vendor/lattice_ice40.py
@@ -126,19 +126,14 @@ class LatticeICE40Platform(TemplatedPlatform):
             {{get_override("script_after_synth")|default("# (script_after_synth placeholder)")}}
             write_json {{name}}.json
         """,
-        "{{name}}_pre_pack.py": r"""
-            # {{autogenerated}}
-            {% for signal, frequency in platform.iter_clock_constraints() -%}
-            {# Clock in MHz #}
-            ctx.addClock("{{signal|hierarchy(".")}}", {{frequency/1000000}})
-            {% endfor%}
-            {{get_override("add_pre_pack")|default("# (add_pre_pack placeholder)")}}
-        """,
         "{{name}}.pcf": r"""
             # {{autogenerated}}
             {% for port_name, pin_name, attrs in platform.iter_port_constraints_bits() -%}
                 set_io {{port_name}} {{pin_name}}
             {% endfor %}
+            {% for signal, frequency in platform.iter_clock_constraints() -%}
+                set_frequency "{{signal|hierarchy(".")}}" {{frequency/1000000}}
+            {% endfor%}
             {{get_override("add_constraints")|default("# (add_constraints placeholder)")}}
         """,
     }