From b404d603fb9411dce123fd7939f5aaa54fdb87ee Mon Sep 17 00:00:00 2001
From: "William D. Jones" <thor0505@comcast.net>
Date: Sun, 7 Jul 2019 16:44:48 -0400
Subject: [PATCH] vendor.xilinx_spartan_3_6: Add Spartan3A family support.

---
 ...linx_spartan6.py => xilinx_spartan_3_6.py} | 37 +++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)
 rename nmigen/vendor/{xilinx_spartan6.py => xilinx_spartan_3_6.py} (90%)

diff --git a/nmigen/vendor/xilinx_spartan6.py b/nmigen/vendor/xilinx_spartan_3_6.py
similarity index 90%
rename from nmigen/vendor/xilinx_spartan6.py
rename to nmigen/vendor/xilinx_spartan_3_6.py
index 8ba4981..74a9645 100644
--- a/nmigen/vendor/xilinx_spartan6.py
+++ b/nmigen/vendor/xilinx_spartan_3_6.py
@@ -6,10 +6,14 @@ from ..hdl.ir import *
 from ..build import *
 
 
-__all__ = ["XilinxSpartan6Platform"]
+__all__ = ["XilinxSpartan3APlatform", "XilinxSpartan6Platform"]
 
+# The interface to Spartan 3 and 6 are substantially the same. Handle
+# differences internally using one class and expose user-aliases for
+# convenience.
 
-class XilinxSpartan6Platform(TemplatedPlatform):
+
+class XilinxSpartan3Or6Platform(TemplatedPlatform):
     """
     Required tools:
         * ISE toolchain:
@@ -45,7 +49,8 @@ class XilinxSpartan6Platform(TemplatedPlatform):
         * ``{{name}}_par.ncd``: place and routed netlist.
         * ``{{name}}.drc``: DRC report.
         * ``{{name}}.bgn``: BitGen log.
-        * ``{{name}}.bit``: binary bitstream.
+        * ``{{name}}.bit``: binary bitstream with metadata.
+        * ``{{name}}.bin``: raw binary bitstream.
     """
 
     toolchain = "ISE"
@@ -76,6 +81,10 @@ class XilinxSpartan6Platform(TemplatedPlatform):
             -ifn {{name}}.prj
             -ofn {{name}}.ngc
             -top {{name}}
+            {% if platform.family in ["3", "3E", "3A"] %}
+            -use_new_parser yes
+            {% endif %}
+            -register_balancing yes
             -p {{platform.device}}{{platform.package}}-{{platform.speed}}
             {{get_override("script_after_run")|default("# (script_after_run placeholder)")}}
         """,
@@ -127,11 +136,29 @@ class XilinxSpartan6Platform(TemplatedPlatform):
         r"""
         {{get_tool("bitgen")}}
             {{get_override("bitgen_opts")|default(["-w"])|options}}
+            -g Binary:Yes
             {{name}}_par.ncd
             {{name}}.bit
         """
     ]
 
+    @property
+    def family(self):
+        device = self.device.upper()
+        if device.startswith("XC3S"):
+            if device.endswith("A"):
+                return "3A"
+            elif device.endswith("E"):
+                raise NotImplementedError("""Spartan 3E family is not supported
+                                           as a nMigen platform.""")
+            else:
+                raise NotImplementedError("""Spartan 3 family is not supported
+                                           as a nMigen platform.""")
+        elif device.startswith("XC6S"):
+            return "6"
+        else:
+            assert False
+
     def _get_xdr_buffer(self, m, pin, i_invert=None, o_invert=None):
         def get_dff(clk, d, q):
             # SDR I/O is performed by packing a flip-flop into the pad IOB.
@@ -353,3 +380,7 @@ class XilinxSpartan6Platform(TemplatedPlatform):
                 io_IO=p_port[bit], io_IOB=n_port[bit]
             )
         return m
+
+
+XilinxSpartan3APlatform = XilinxSpartan3Or6Platform
+XilinxSpartan6Platform = XilinxSpartan3Or6Platform
-- 
2.30.2