targets/arty: integrate symbiflow changes to avoid duplication.

diff --git a/litex/boards/platforms/arty.py b/litex/boards/platforms/arty.py
index 32059448745c5e7b6fa8f39d0eba50c3130fbbd9..7e72b4a903d5e3fd99724b7f13697ce70a86b3c5 100644 (file)
--- a/litex/boards/platforms/arty.py
+++ b/litex/boards/platforms/arty.py
@@ -265,7 +265,8 @@ class Platform(XilinxPlatform):
         self.toolchain.additional_commands = \
             ["write_cfgmem -force -format bin -interface spix4 -size 16 "
              "-loadbit \"up 0x0 {build_name}.bit\" -file {build_name}.bin"]
-        self.add_platform_command("set_property INTERNAL_VREF 0.675 [get_iobanks 34]")
+        if toolchain == "vivado": # FIXME
+            self.add_platform_command("set_property INTERNAL_VREF 0.675 [get_iobanks 34]")
 
     def create_programmer(self):
         bscan_spi = "bscan_spi_xc7a100t.bit" if "xc7a100t" in self.device else "bscan_spi_xc7a35t.bit"
@@ -273,4 +274,6 @@ class Platform(XilinxPlatform):
 
     def do_finalize(self, fragment):
         XilinxPlatform.do_finalize(self, fragment)
-        self.add_period_constraint(self.lookup_request("clk100", loose=True), 1e9/100e6)
+        from litex.build.xilinx import symbiflow
+        if not isinstance(self.toolchain, symbiflow.SymbiflowToolchain): # FIXME
+            self.add_period_constraint(self.lookup_request("clk100", loose=True), 1e9/100e6)

diff --git a/litex/boards/targets/arty.py b/litex/boards/targets/arty.py
index fe6c8f5221c2a07d54ce4f11b34d5d666aaf89a8..1116fa2f4ee2713a0053f2a294c019e7fe6c64c3 100755 (executable)
--- a/litex/boards/targets/arty.py
+++ b/litex/boards/targets/arty.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 # This file is Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
+# This file is Copyright (c) 2020 Antmicro <www.antmicro.com>
 # License: BSD
 
 import os
@@ -25,7 +26,7 @@ from liteeth.phy.mii import LiteEthPHYMII
 # CRG ----------------------------------------------------------------------------------------------
 
 class _CRG(Module):
-    def __init__(self, platform, sys_clk_freq):
+    def __init__(self, platform, sys_clk_freq, toolchain):
         self.clock_domains.cd_sys       = ClockDomain()
         self.clock_domains.cd_sys2x     = ClockDomain(reset_less=True)
         self.clock_domains.cd_sys4x     = ClockDomain(reset_less=True)
@@ -35,34 +36,49 @@ class _CRG(Module):
 
         # # #
 
-        self.submodules.pll = pll = S7PLL(speedgrade=-1)
-        self.comb += pll.reset.eq(~platform.request("cpu_reset"))
-        pll.register_clkin(platform.request("clk100"), 100e6)
-        pll.create_clkout(self.cd_sys,       sys_clk_freq)
-        pll.create_clkout(self.cd_sys2x,     2*sys_clk_freq)
-        pll.create_clkout(self.cd_sys4x,     4*sys_clk_freq)
-        pll.create_clkout(self.cd_sys4x_dqs, 4*sys_clk_freq, phase=90)
-        pll.create_clkout(self.cd_clk200,    200e6)
-        pll.create_clkout(self.cd_eth,       25e6)
-
-        self.submodules.idelayctrl = S7IDELAYCTRL(self.cd_clk200)
-
-        self.comb += platform.request("eth_ref_clk").eq(self.cd_eth.clk)
+        if toolchain == "vivado":
+            self.submodules.pll = pll = S7PLL(speedgrade=-1)
+            self.comb += pll.reset.eq(~platform.request("cpu_reset"))
+            pll.register_clkin(platform.request("clk100"), 100e6)
+            pll.create_clkout(self.cd_sys,       sys_clk_freq)
+            pll.create_clkout(self.cd_sys2x,     2*sys_clk_freq)
+            pll.create_clkout(self.cd_sys4x,     4*sys_clk_freq)
+            pll.create_clkout(self.cd_sys4x_dqs, 4*sys_clk_freq, phase=90)
+            pll.create_clkout(self.cd_clk200,    200e6)
+            pll.create_clkout(self.cd_eth,       25e6)
+
+            self.submodules.idelayctrl = S7IDELAYCTRL(self.cd_clk200)
+
+            self.comb += platform.request("eth_ref_clk").eq(self.cd_eth.clk)
+        elif toolchain == "symbiflow": # FIXME
+            clk100_ibuf = Signal()
+            clk100_buf  = Signal()
+            self.specials += Instance("IBUF", i_I=platform.request("clk100"), o_O=clk100_ibuf)
+            self.specials += Instance("BUFG", i_I=clk100_ibuf, o_O=clk100_buf)
+
+            self.submodules.pll = pll = S7PLL(speedgrade=-1)
+            self.comb += pll.reset.eq(~platform.request("cpu_reset"))
+            pll.register_clkin(clk100_buf, 100e6)
+            pll.create_clkout(self.cd_sys, sys_clk_freq)
+
+            platform.add_period_constraint(clk100_buf, 1e9/100e6)
+            platform.add_period_constraint(self.cd_sys.clk, 1e9/sys_clk_freq)
+            platform.add_false_path_constraints(clk100_buf, self.cd_sys.clk)
 
 # BaseSoC ------------------------------------------------------------------------------------------
 
 class BaseSoC(SoCCore):
-    def __init__(self, sys_clk_freq=int(100e6), with_ethernet=False, with_etherbone=False, **kwargs):
-        platform = arty.Platform()
+    def __init__(self, toolchain, sys_clk_freq=int(100e6), with_ethernet=False, with_etherbone=False, **kwargs):
+        platform = arty.Platform(toolchain=toolchain)
 
         # SoCCore ----------------------------------------------------------------------------------
         SoCCore.__init__(self, platform, clk_freq=sys_clk_freq, **kwargs)
 
         # CRG --------------------------------------------------------------------------------------
-        self.submodules.crg = _CRG(platform, sys_clk_freq)
+        self.submodules.crg = _CRG(platform, sys_clk_freq, toolchain)
 
         # DDR3 SDRAM -------------------------------------------------------------------------------
-        if not self.integrated_main_ram_size:
+        if not self.integrated_main_ram_size and toolchain != "symbiflow": # FIXME
             self.submodules.ddrphy = s7ddrphy.A7DDRPHY(platform.request("ddram"),
                 memtype        = "DDR3",
                 nphases        = 4,
@@ -102,6 +118,7 @@ def main():
     parser = argparse.ArgumentParser(description="LiteX SoC on Arty A7")
     parser.add_argument("--build", action="store_true", help="Build bitstream")
     parser.add_argument("--load",  action="store_true", help="Load bitstream")
+    parser.add_argument("--toolchain", default="vivado", help="Gateware toolchain to use, vivado (default) or symbiflow")
     builder_args(parser)
     soc_sdram_args(parser)
     vivado_build_args(parser)
@@ -110,10 +127,11 @@ def main():
     args = parser.parse_args()
 
     assert not (args.with_ethernet and args.with_etherbone)
-    soc = BaseSoC(with_ethernet=args.with_ethernet, with_etherbone=args.with_etherbone,
+    soc = BaseSoC(args.toolchain, with_ethernet=args.with_ethernet, with_etherbone=args.with_etherbone,
         **soc_sdram_argdict(args))
     builder = Builder(soc, **builder_argdict(args))
-    builder.build(**vivado_build_argdict(args), run=args.build)
+    builder_kwargs = vivado_build_argdict(args) if args.toolchain == "vivado" else {}
+    builder.build(**builder_kwargs, run=args.build)
 
     if args.load:
         prog = soc.platform.create_programmer()

diff --git a/litex/boards/targets/arty_symbiflow.py b/litex/boards/targets/arty_symbiflow.py
deleted file mode 100755 (executable)
index 394ffe7..0000000
--- a/litex/boards/targets/arty_symbiflow.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env python3
-
-# This file is Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
-# This file is Copyright (c) 2020 Antmicro <www.antmicro.com>
-# License: BSD
-
-import os
-import argparse
-
-from migen import *
-
-from litex.boards.platforms import arty
-from litex.build.xilinx.symbiflow import symbiflow_build_args, symbiflow_build_argdict
-
-from litex.soc.cores.clock import *
-from litex.soc.integration.soc_core import *
-from litex.soc.integration.soc_sdram import *
-from litex.soc.integration.builder import *
-from litex.soc.cores.led import LedChaser
-
-# CRG ----------------------------------------------------------------------------------------------
-
-class _CRG(Module):
-    def __init__(self, platform, sys_clk_freq):
-        self.clock_domains.cd_sys = ClockDomain()
-
-        clk100_ibuf = Signal()
-        clk100_buf  = Signal()
-        self.specials += Instance("IBUF", i_I=platform.request("clk100"), o_O=clk100_ibuf)
-        self.specials += Instance("BUFG", i_I=clk100_ibuf, o_O=clk100_buf)
-
-        self.submodules.pll = pll = S7PLL(speedgrade=-1)
-        self.comb += pll.reset.eq(~platform.request("cpu_reset"))
-        pll.register_clkin(clk100_buf, 100e6)
-        pll.create_clkout(self.cd_sys, sys_clk_freq)
-
-        platform.add_period_constraint(clk100_buf, 1e9/100e6)
-        platform.add_period_constraint(self.cd_sys.clk, 1e9/sys_clk_freq)
-        platform.add_false_path_constraints(clk100_buf, self.cd_sys.clk)
-
-# BaseSoC ------------------------------------------------------------------------------------------
-
-class BaseSoC(SoCCore):
-    def __init__(self, sys_clk_freq=int(60e6), with_ethernet=False, with_etherbone=False, **kwargs):
-        platform = arty.Platform(toolchain="symbiflow")
-
-        # SoCCore ----------------------------------------------------------------------------------
-        SoCCore.__init__(self, platform, clk_freq=sys_clk_freq, **kwargs)
-
-        # CRG --------------------------------------------------------------------------------------
-        self.submodules.crg = _CRG(platform, sys_clk_freq)
-
-        self.submodules.leds = LedChaser(
-            pads         = Cat(*[platform.request("user_led", i) for i in range(4)]),
-            sys_clk_freq = sys_clk_freq)
-        self.add_csr("leds")
-
-# Build --------------------------------------------------------------------------------------------
-
-def main():
-    parser = argparse.ArgumentParser(description="LiteX SoC on Arty A7")
-    parser.add_argument("--build", action="store_true", help="Build bitstream")
-    parser.add_argument("--load",  action="store_true", help="Load bitstream")
-    builder_args(parser)
-    soc_core_args(parser)
-    symbiflow_build_args(parser)
-    args = parser.parse_args()
-
-    soc = BaseSoC(**soc_core_argdict(args))
-    builder = Builder(soc, **builder_argdict(args))
-    builder.build(**symbiflow_build_argdict(args), run=args.build)
-
-    if args.load:
-        prog = soc.platform.create_programmer()
-        prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit"))
-
-if __name__ == "__main__":
-    main()