From: whitequark <whitequark@whitequark.org>
Date: Wed, 19 Jun 2019 06:09:08 +0000 (+0000)
Subject: vendor.lattice_ice40: use different --package for 4k devices.
X-Git-Tag: locally_working~153
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=23ed888857ea7989a560a27bf0e6996e76e3fb8e;p=nmigen.git

vendor.lattice_ice40: use different --package for 4k devices.
---

diff --git a/nmigen/vendor/lattice_ice40.py b/nmigen/vendor/lattice_ice40.py
index be1e996..f298ece 100644
--- a/nmigen/vendor/lattice_ice40.py
+++ b/nmigen/vendor/lattice_ice40.py
@@ -46,6 +46,10 @@ class LatticeICE40Platform(TemplatedPlatform):
         "iCE40UP5K":  "--up5k",
         "iCE5LP4K":   "--u4k",
     }
+    _nextpnr_package_options = {
+        "iCE40LP4K":  ":4k",
+        "iCE40HX4K":  ":4k",
+    }
 
     file_templates = {
         **TemplatedPlatform.build_script_templates,
@@ -96,7 +100,8 @@ class LatticeICE40Platform(TemplatedPlatform):
             {{get_override("nextpnr_opts")|default(["--placer","heap"])|join(" ")}}
             --log {{name}}.tim
             {{platform._nextpnr_device_options[platform.device]}}
-            --package {{platform.package|lower}}
+            --package
+                {{platform.package|lower}}{{platform._nextpnr_package_options[platform.device]}}
             --json {{name}}.json
             --pcf {{name}}.pcf
             --pre-pack {{name}}_pre_pack.py