From a752dafb1400c797e0cc6521d5867e6a37fc5373 Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Mon, 12 Nov 2018 09:45:59 +0100
Subject: [PATCH] targets: add versa_ecp5 with sdram (ecp5 soc hat) at 25MHz/no
 pll

---
 .../{versaecp55g_sdram.py => versa_ecp5.py}   | 82 +++++++------------
 1 file changed, 31 insertions(+), 51 deletions(-)
 rename litex/boards/targets/{versaecp55g_sdram.py => versa_ecp5.py} (51%)

diff --git a/litex/boards/targets/versaecp55g_sdram.py b/litex/boards/targets/versa_ecp5.py
similarity index 51%
rename from litex/boards/targets/versaecp55g_sdram.py
rename to litex/boards/targets/versa_ecp5.py
index c279f8ef..f5db19f0 100755
--- a/litex/boards/targets/versaecp55g_sdram.py
+++ b/litex/boards/targets/versa_ecp5.py
@@ -5,17 +5,19 @@ import argparse
 from migen import *
 from migen.genlib.resetsync import AsyncResetSynchronizer
 
-from litex.boards.platforms import versaecp55g_sdram
+from litex.boards.platforms import versa_ecp5
 
 from litex.soc.integration.soc_sdram import *
 from litex.soc.integration.builder import *
 
 from litedram.modules import AS4C32M16
 from litedram.phy import GENSDRPHY
+from litedram.core.controller import ControllerSettings
 
 
 class _CRG(Module):
     def __init__(self, platform):
+        self.clock_domains.cd_sys_4x = ClockDomain(reset_less=True)
         self.clock_domains.cd_sys = ClockDomain()
         self.clock_domains.cd_sys_ps = ClockDomain()
 
@@ -24,65 +26,41 @@ class _CRG(Module):
         clk100 = platform.request("clk100")
         rst_n = platform.request("rst_n")
 
-        rst = Signal()
-        self.comb += rst.eq(~rst_n)
+        # sys_4x_clk divider
+        self.comb += self.cd_sys_4x.clk.eq(clk100)
+        sys_4x_divider = Signal(2)
+        self.sync.sys_4x += sys_4x_divider.eq(sys_4x_divider + 1)
 
         # sys_clk
+        self.comb += self.cd_sys.clk.eq(sys_4x_divider[-1])
         # FIXME: AsyncResetSynchronizer needs FD1S3BX support.
         #self.specials += AsyncResetSynchronizer(self.cd_sys, rst)
-        self.comb += self.cd_sys.rst.eq(rst)
-        self.comb += self.cd_sys_ps.rst.eq(rst)
-
-        sys_clk = Signal()
-        sdram_ps_clk = Signal()
-        lock = Signal()
-
-        self.specials += Instance(
-            "EHXPLLL",
-            i_CLKI=clk100,
-            i_CLKFB=sys_clk,
-            i_PHASESEL1=0,
-            i_PHASESEL0=0,
-            i_PHASEDIR=0,
-            i_PHASESTEP=0,
-            i_PHASELOADREG=0,
-            i_STDBY=0,
-            i_PLLWAKESYNC=0,
-            i_RST=0,
-            i_ENCLKOP=0,
-            i_ENCLKOS=0,
-            o_CLKOP=sys_clk,
-            o_CLKOS=sdram_ps_clk,
-            o_LOCK=lock,
-            p_CLKOS_FPHASE=0,
-            p_CLKOS_CPHASE=17,
-            p_CLKOP_FPHASE=0,
-            p_CLKOP_CPHASE=11,
-            p_PLL_LOCK_MODE=0,
-            p_OUTDIVIDER_MUXB="DIVB",
-            p_OUTDIVIDER_MUXA="DIVA",
-            p_CLKOS_ENABLE="ENABLED",
-            p_CLKOP_ENABLE="ENABLED",
-            p_CLKOS_DIV=12,
-            p_CLKOP_DIV=12,
-            p_CLKFB_DIV=1,
-            p_CLKI_DIV=2,
-            p_FEEDBK_PATH="CLKOP",
-            attr=[("ICP_CURRENT", "12"), ("LPF_RESISTOR", "8"), ("MFG_ENABLE_FILTEROPAMP", "1"), ("MFG_GMCREF_SEL", "2")]
-        )
-
-        self.comb += self.cd_sys.clk.eq(sys_clk)
+        self.comb += self.cd_sys.rst.eq(~rst_n)
+
+        # sys_clk phase shifted (for sdram)
+        sdram_ps_clk = self.cd_sys.clk
+        # FIXME: phase shift with luts, needs PLL support.
+        sdram_ps_luts = 5
+        for i in range(sdram_ps_luts):
+            new_sdram_ps_clk = Signal()
+            self.specials += Instance("LUT4",
+                p_INIT=2,
+                i_A=sdram_ps_clk,
+                i_B=0,
+                i_C=0,
+                i_D=0,
+                o_Z=new_sdram_ps_clk)
+            sdram_ps_clk = new_sdram_ps_clk
         self.comb += self.cd_sys_ps.clk.eq(sdram_ps_clk)
         sdram_clock = platform.request("sdram_clock")
         self.comb += sdram_clock.eq(sdram_ps_clk)
-        led0 = platform.request("user_led", 0)
-        self.comb += led0.eq(~lock)
 
 
 class BaseSoC(SoCSDRAM):
     def __init__(self, **kwargs):
-        platform = versaecp55g_sdram.Platform(toolchain="prjtrellis")
-        sys_clk_freq = int(50e6)
+        platform = versa_ecp5.Platform(toolchain="prjtrellis")
+        platform.add_extension(versa_ecp5._ecp5_soc_hat_io)
+        sys_clk_freq = int(25e6)
         SoCSDRAM.__init__(self, platform, clk_freq=sys_clk_freq,
                           l2_size=32,
                           integrated_rom_size=0x8000,
@@ -95,11 +73,13 @@ class BaseSoC(SoCSDRAM):
             sdram_module = AS4C32M16(sys_clk_freq, "1:1")
             self.register_sdram(self.sdrphy,
                                 sdram_module.geom_settings,
-                                sdram_module.timing_settings)
+                                sdram_module.timing_settings,
+                                controller_settings=ControllerSettings(
+                                    with_refresh=False)) # FIXME
 
 
 def main():
-    parser = argparse.ArgumentParser(description="LiteX SoC port to the ECP5 Versa board with SDRAM hat")
+    parser = argparse.ArgumentParser(description="LiteX SoC port to the ULX3S")
     builder_args(parser)
     soc_sdram_args(parser)
     args = parser.parse_args()
-- 
2.30.2