Debugging ULX3S SDRAM

Signed-off-by: David Shah <dave@ds0.me>

diff --git a/litex/boards/platforms/ulx3s.py b/litex/boards/platforms/ulx3s.py
index 319596d2916b6a475f6a75b185f87f8622035e6d..c17ce331897192a7b847fadd6791a3eb13d403af 100644 (file)
--- a/litex/boards/platforms/ulx3s.py
+++ b/litex/boards/platforms/ulx3s.py
@@ -34,10 +34,14 @@ _io = [
         Subsignal("cke", Pins("F20")),
         Subsignal("ba", Pins("P19 N20")),
         Subsignal("dm", Pins("U19 E20")),
-        IOStandard("LVCMOS33")
+        IOStandard("LVCMOS33"), Misc("SLEWRATE=FAST")
     ),
 
     ("wifi_gpio0", 0, Pins("L2"), IOStandard("LVCMOS33")),
+
+    ("ext0p", 0, Pins("B11"), IOStandard("LVCMOS33")),
+    ("ext1p", 0, Pins("A10"), IOStandard("LVCMOS33")),
+
 ]
 
 

diff --git a/litex/boards/targets/ulx3s.py b/litex/boards/targets/ulx3s.py
index af1aa19e42bede3ffa04ecf283dddbe46098d5c7..27940fe0aca0582781b415d388caa26fe824a20f 100755 (executable)
--- a/litex/boards/targets/ulx3s.py
+++ b/litex/boards/targets/ulx3s.py
@@ -25,38 +25,65 @@ class _CRG(Module):
         rst = platform.request("rst")
 
         # sys_clk
-        self.comb += self.cd_sys.clk.eq(clk25)
         # FIXME: AsyncResetSynchronizer needs FD1S3BX support.
         #self.specials += AsyncResetSynchronizer(self.cd_sys, rst)
         self.comb += self.cd_sys.rst.eq(rst)
-
-        # 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.rst.eq(rst)
+
+        sys_clk = Signal()
+        sdram_ps_clk = Signal()
+
+        self.specials += Instance(
+            "EHXPLLL",
+            i_CLKI=clk25,
+            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,
+            p_CLKOS_FPHASE=2,
+            p_CLKOS_CPHASE=15,
+            p_CLKOP_FPHASE=0,
+            p_CLKOP_CPHASE=12,
+            p_PLL_LOCK_MODE=0,
+            p_OUTDIVIDER_MUXB="DIVB",
+            p_CLKOS_ENABLE="ENABLED",
+            p_CLKOP_ENABLE="ENABLED",
+            p_CLKOS_DIV=13,
+            p_CLKOP_DIV=13,
+            p_CLKFB_DIV=2,
+            p_CLKI_DIV=1,
+            p_FEEDBK_PATH="CLKOP",
+            attr=[("ICP_CURRENT", "6"), ("LPF_RESISTOR", "16"), ("MFG_ENABLE_FILTEROPAMP", "1"), ("MFG_GMCREF_SEL", "2")]
+        )
+
+        self.comb += self.cd_sys.clk.eq(sys_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)
+        self.comb += sdram_clock.eq(sys_clk)
 
         # Stop ESP32 from resetting FPGA
         wifi_gpio0 = platform.request("wifi_gpio0")
         self.comb += wifi_gpio0.eq(1)
 
+        ext0p = platform.request("ext0p")
+        self.comb += ext0p.eq(sdram_ps_clk)
+        ext1p = platform.request("ext1p")
+        self.comb += ext1p.eq(self.cd_sys.clk)
+
 
 class BaseSoC(SoCSDRAM):
     def __init__(self, **kwargs):
         platform = ulx3s.Platform(toolchain="prjtrellis")
-        sys_clk_freq = int(25e6)
+        sys_clk_freq = int(50e6)
         SoCSDRAM.__init__(self, platform, clk_freq=sys_clk_freq,
                           l2_size=32,
                           integrated_rom_size=0x8000,

diff --git a/litex/build/lattice/prjtrellis.py b/litex/build/lattice/prjtrellis.py
index ec983505f6dafac4ccfabe75186531fd9803cd2c..79df493a7a7efb176da905c68e98ceccdb9392fd 100644 (file)
--- a/litex/build/lattice/prjtrellis.py
+++ b/litex/build/lattice/prjtrellis.py
@@ -33,7 +33,7 @@ def _format_constraint(c):
     elif isinstance(c, IOStandard):
         return ("IOBUF PORT ", " IO_TYPE=" + c.name)
     elif isinstance(c, Misc):
-        return c.misc
+        return ("IOBUF PORT ", " " + c.misc)
 
 
 def _format_lpf(signame, pin, others, resname):