From: whitequark <cz@m-labs.hk>
Date: Sun, 4 Aug 2019 23:23:06 +0000 (+0000)
Subject: vendor.xilinx_spartan_3_6: reconsider bitgen defaults.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fb0846c9367ae62615d828c0d4c62673cb7da132;p=nmigen.git

vendor.xilinx_spartan_3_6: reconsider bitgen defaults.

Previously changed in 27063a3b.

I haven't realized the .bin file is the same as the .bit file without
a small header. That means generating it is free and it's just easier
to let programming tools to be able to always rely on its existence.
---

diff --git a/nmigen/vendor/xilinx_spartan_3_6.py b/nmigen/vendor/xilinx_spartan_3_6.py
index 374ff05..3b3b9bf 100644
--- a/nmigen/vendor/xilinx_spartan_3_6.py
+++ b/nmigen/vendor/xilinx_spartan_3_6.py
@@ -33,7 +33,8 @@ class XilinxSpartan3Or6Platform(TemplatedPlatform):
         * ``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 options for BitGen.
+        * ``bitgen_opts``: adds extra and overrides default options for BitGen;
+          default options: ``-g Compress``.
 
     Build products:
         * ``{{name}}.srp``: synthesis report.
@@ -154,8 +155,9 @@ class XilinxSpartan3Or6Platform(TemplatedPlatform):
         """,
         r"""
         {{get_tool("bitgen")}}
-            {{get_override("bitgen_opts")|default(["-g Binary:Yes", "-g Compress"])|options}}
+            {{get_override("bitgen_opts")|default(["-g Compress"])|options}}
             -w
+            -g Binary:Yes
             {{name}}_par.ncd
             {{name}}.bit
         """