From 83e06cad8049418cb5eba879012581429b85eda9 Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Sun, 27 Dec 2015 15:42:37 +0100
Subject: [PATCH] example_designs: change the way we build cores (ensure
 consistent IO naming)

---
 example_designs/make.py         | 10 ++++------
 example_designs/targets/core.py | 18 ++++++------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/example_designs/make.py b/example_designs/make.py
index 1266a38..0ba1de7 100644
--- a/example_designs/make.py
+++ b/example_designs/make.py
@@ -45,7 +45,7 @@ This program builds and/or loads LiteScope components.
 One or several actions can be specified:
 
 clean           delete previous build(s).
-build-rtl       build verilog rtl.
+build-core      build verilog core.
 build-bitstream build-bitstream build FPGA bitstream.
 build-csr-csv   save CSR map into CSV file.
 
@@ -165,16 +165,14 @@ RLE: {}
         write_to_file(args.csr_csv, csr_csv)
 
     if actions["build-core"]:
-        ios = soc.get_ios()
-        if not isinstance(soc, _Fragment):
-            soc = soc.get_fragment()
-        platform.finalize(soc)
+        soc_fragment = soc.get_fragment()
+        platform.finalize(soc_fragment)
         so = {
             NoRetiming:             XilinxNoRetiming,
             MultiReg:               XilinxMultiReg,
             AsyncResetSynchronizer: XilinxAsyncResetSynchronizer
         }
-        v_output = verilog.convert(soc, ios, special_overrides=so)
+        v_output = platform.get_verilog(soc_fragment, name="litescope", special_overrides=so)
         v_output.write("build/litescope.v")
 
     if actions["build-bitstream"]:
diff --git a/example_designs/targets/core.py b/example_designs/targets/core.py
index e103a50..e48aa75 100644
--- a/example_designs/targets/core.py
+++ b/example_designs/targets/core.py
@@ -15,8 +15,8 @@ from litescope.frontend.logic_analyzer import LiteScopeLogicAnalyzer
 
 
 _io = [
-    ("sys_clk", 0, Pins(1)),
-    ("sys_rst", 1, Pins(1)),
+    ("sys_clock", 0, Pins(1)),
+    ("sys_reset", 1, Pins(1)),
     ("serial", 0,
         Subsignal("tx", Pins(1)),
         Subsignal("rx", Pins(1)),
@@ -42,8 +42,11 @@ class Core(SoCCore):
     csr_map.update(SoCCore.csr_map)
 
     def __init__(self, platform, clk_freq=100*1000000):
-        self.clk_freq = clk_freq
         self.clock_domains.cd_sys = ClockDomain("sys")
+        self.comb += [
+            self.cd_sys.clk.eq(platform.request("sys_clock")),
+            self.cd_sys.rst.eq(platform.request("sys_reset"))
+        ]
         SoCCore.__init__(self, platform, clk_freq,
             cpu_type=None,
             csr_data_width=32,
@@ -58,13 +61,4 @@ class Core(SoCCore):
         self.submodules.logic_analyzer = LiteScopeLogicAnalyzer((self.bus), 512, with_rle=True, with_subsampler=True)
         self.logic_analyzer.trigger.add_port(LiteScopeTerm(self.logic_analyzer.dw))
 
-    def get_ios(self):
-        ios = set()
-        ios = ios.union({self.cd_sys.clk,
-                         self.cd_sys.rst})
-        ios = ios.union({self.platform.lookup_request("serial").rx,
-                         self.platform.lookup_request("serial").tx})
-        ios = ios.union({self.bus})
-        return ios
-
 default_subtarget = Core