litedram_gen: cleanup SDRAM PHY selection, remove plarform configuration parameter (can be deduced from PHY)

examples/arty.yml

@@ -3,7 +3,6 @@
 
 {
     # General ------------------------------------------------------------------
-    "platform":   "xilinx",    # Platform type
     "cpu":        "vexriscv",  # Type of CPU used for init/calib (vexriscv, lm32)
     "speedgrade": -1,          # FPGA speedgrade
     "memtype":    "DDR3",      # DRAM type

examples/genesys2.yml

@@ -3,7 +3,6 @@
 
 {
     # General ------------------------------------------------------------------
-    "platform":   "xilinx",   # Platform type
     "cpu":        "vexriscv", # Type of CPU used for init/calib (vexriscv, lm32)
     "speedgrade": -2,         # FPGA speedgrade
     "memtype":    "DDR3",     # DRAM type

examples/nexys4ddr.yml

@@ -3,7 +3,6 @@
 
 {
     # General ------------------------------------------------------------------
-    "platform":   "xilinx",    # Platform type
     "cpu":        "vexriscv",  # Type of CPU used for init/calib (vexriscv, lm32)
     "speedgrade": -1,          # FPGA speedgrade
     "memtype":    "DDR2",      # DRAM type

examples/versa_ecp5.yml

@@ -3,8 +3,8 @@
 
 {
     # General ------------------------------------------------------------------
-    "platform":   "ecp5", # Platform type
     "cpu":        None,   # Type of CPU used for init/calib (vexriscv, lm32)
+    "memtype":    "DDR3", # DRAM type
 
     # PHY ----------------------------------------------------------------------
     "sdram_module":    "MT41K64M16",  # SDRAM modules of the board or SO-DIMM

litedram/gen.py

@@ -32,6 +32,7 @@ from migen.genlib.resetsync import AsyncResetSynchronizer
 
 from litex.build.generic_platform import *
 from litex.build.xilinx import XilinxPlatform
+from litex.build.lattice import LatticePlatform
 from litex.boards.platforms import versa_ecp5
 
 from litex.soc.cores.clock import *
@@ -43,6 +44,8 @@ from litex.soc.cores.uart import *
 
 from litedram import modules as litedram_modules
 from litedram import phy as litedram_phys
+from litedram.phy.ecp5ddrphy import ECP5DDRPHY
+from litedram.phy.s7ddrphy import S7DDRPHY
 from litedram.core.controller import ControllerSettings
 from litedram.frontend.axi import *
 from litedram.frontend.wishbone import *
@@ -336,28 +339,21 @@ class LiteDRAMCore(SoCSDRAM):
             **kwargs)
 
         # CRG --------------------------------------------------------------------------------------
+        if core_config["sdram_phy"] in [litedram_phys.ECP5DDRPHY]:
+            self.submodules.crg = crg = LatticeDRAMCRG(platform, core_config)
+        if core_config["sdram_phy"] in [litedram_phys.A7DDRPHY, litedram_phys.K7DDRPHY, litedram_phys.V7DDRPHY]:
+            self.submodules.crg = LiteDRAMCRG(platform, core_config)
 
-        if core_config["platform"] == "ecp5":
+        # DRAM -------------------------------------------------------------------------------------
-            crg = LatticeDRAMCRG(platform, core_config)
+        platform.add_extension(get_dram_ios(core_config))
-            self.submodules.crg = crg
+        if core_config["sdram_phy"] in  [litedram_phys.ECP5DDRPHY]:
-
+            assert core_config["memtype"] in ["DDR3"]
             self.submodules.ddrphy = core_config["sdram_phy"](
                 platform.request("ddram"),
                 sys_clk_freq=sys_clk_freq)
             self.comb += crg.stop.eq(self.ddrphy.init.stop)
             sdram_module = core_config["sdram_module"](sys_clk_freq, "1:2")
-
+        if core_config["sdram_phy"] in [litedram_phys.A7DDRPHY, litedram_phys.K7DDRPHY, litedram_phys.V7DDRPHY]:
-            controller_settings = controller_settings=ControllerSettings(
-                cmd_buffer_depth=core_config["cmd_buffer_depth"])
-            self.register_sdram(self.ddrphy,
-                sdram_module.geom_settings,
-                sdram_module.timing_settings,
-                controller_settings=controller_settings)
-        else:
-            self.submodules.crg = LiteDRAMCRG(platform, core_config)
-
-            # DRAM -------------------------------------------------------------------------------------
-            platform.add_extension(get_dram_ios(core_config))
             assert core_config["memtype"] in ["DDR2", "DDR3"]
             self.submodules.ddrphy = core_config["sdram_phy"](
                 platform.request("ddram"),
@@ -372,14 +368,16 @@ class LiteDRAMCore(SoCSDRAM):
                     rtt_nom=core_config["rtt_nom"],
                     rtt_wr=core_config["rtt_wr"],
                     ron=core_config["ron"])
-            sdram_module = core_config["sdram_module"](sys_clk_freq,
+
-                "1:4" if core_config["memtype"] == "DDR3" else "1:2")
+
-            controller_settings = controller_settings=ControllerSettings(
+        sdram_module = core_config["sdram_module"](sys_clk_freq,
-                cmd_buffer_depth=core_config["cmd_buffer_depth"])
+            "1:4" if core_config["memtype"] == "DDR3" else "1:2")
-            self.register_sdram(self.ddrphy,
+        controller_settings = controller_settings=ControllerSettings(
-                                sdram_module.geom_settings,
+            cmd_buffer_depth=core_config["cmd_buffer_depth"])
-                                sdram_module.timing_settings,
+        self.register_sdram(self.ddrphy,
-                                controller_settings=controller_settings)
+                            sdram_module.geom_settings,
+                            sdram_module.timing_settings,
+                            controller_settings=controller_settings)
 
         # DRAM Initialization ----------------------------------------------------------------------
         self.submodules.ddrctrl = LiteDRAMCoreControl()
@@ -565,13 +563,12 @@ def main():
             core_config[k] = getattr(litedram_phys, core_config[k])
 
     # Generate core --------------------------------------------------------------------------------
-    platform = Platform()
+    if core_config["sdram_phy"] in [litedram_phys.ECP5DDRPHY]:
-    if core_config["platform"] == "ecp5":
         platform = versa_ecp5.Platform(toolchain="trellis")
-    elif core_config["platform"] == "xilinx":
+    elif core_config["sdram_phy"] in [litedram_phys.A7DDRPHY, litedram_phys.K7DDRPHY, litedram_phys.V7DDRPHY]:
         platform = XilinxPlatform("", io=[], toolchain="vivado")
     else:
-        raise ValueError("Unknown platform specified in {}".format(args.config));
+        raise ValueError("Unsupported SDRAM PHY: {}".format(core_config["sdram_phy"]))
 
     soc      = LiteDRAMCore(platform, core_config, integrated_rom_size=0x6000, integrated_sram_size=0x1000)
     builder  = Builder(soc, output_dir="build", compile_gateware=False)