targets: remove sdram_controller_type parameter (minicon removed)
authorFlorent Kermarrec <florent@enjoy-digital.fr>
Fri, 29 Apr 2016 15:51:16 +0000 (17:51 +0200)
committerFlorent Kermarrec <florent@enjoy-digital.fr>
Fri, 29 Apr 2016 15:51:16 +0000 (17:51 +0200)
litex/boards/targets/de0nano.py
litex/boards/targets/kc705.py
litex/boards/targets/minispartan6.py
litex/boards/targets/sim.py

index 63ac8f8fa7e6671346ff526544a7b99dd88c5b1e..7fb9d625824ee1bd07e21fd8ef06bc5851187130 100755 (executable)
@@ -98,8 +98,9 @@ class BaseSoC(SoCSDRAM):
         if not self.integrated_main_ram_size:
             self.submodules.sdrphy = GENSDRPHY(platform.request("sdram"),)
             sdram_module = IS42S16160(self.clk_freq, "1:1")
-            self.register_sdram(self.sdrphy, "minicon",
-                                sdram_module.geom_settings, sdram_module.timing_settings)
+            self.register_sdram(self.sdrphy,
+                                sdram_module.geom_settings,
+                                sdram_module.timing_settings)
 
 def main():
     parser = argparse.ArgumentParser(description="LiteX SoC port to the Altera DE0 Nano")
index 14c8696c528cf64cf116a941c189855168dc898e..65500af7c91ccfb19c0e5f72bc713937b211efd6 100755 (executable)
@@ -84,7 +84,7 @@ class BaseSoC(SoCSDRAM):
     }
     csr_map.update(SoCSDRAM.csr_map)
 
-    def __init__(self, toolchain="ise", sdram_controller_type="minicon", **kwargs):
+    def __init__(self, toolchain="ise", **kwargs):
         platform = kc705.Platform(toolchain=toolchain)
         SoCSDRAM.__init__(self, platform,
                           clk_freq=125*1000000, cpu_reset_address=0xaf0000,
@@ -95,7 +95,7 @@ class BaseSoC(SoCSDRAM):
         if not self.integrated_main_ram_size:
             self.submodules.ddrphy = k7ddrphy.K7DDRPHY(platform.request("ddram"))
             sdram_module = MT8JTF12864(self.clk_freq, "1:4")
-            self.register_sdram(self.ddrphy, sdram_controller_type,
+            self.register_sdram(self.ddrphy,
                                 sdram_module.geom_settings, sdram_module.timing_settings)
 
         if not self.integrated_rom_size:
index 082441db9328068ac1a095542c39672d5064d7d4..04443bdeabe3df4ef5d83b0267808622f1595cde 100755 (executable)
@@ -78,8 +78,9 @@ class BaseSoC(SoCSDRAM):
         if not self.integrated_main_ram_size:
             self.submodules.sdrphy = GENSDRPHY(platform.request("sdram"))
             sdram_module = AS4C16M16(clk_freq, "1:1")
-            self.register_sdram(self.sdrphy, "minicon",
-                                sdram_module.geom_settings, sdram_module.timing_settings)
+            self.register_sdram(self.sdrphy,
+                                sdram_module.geom_settings,
+                                sdram_module.timing_settings)
 
 
 def main():
index ecc5c7c1fc8f56060dab38d8f65ed11363ebac49..b18996eaf06977def14d1e10479969d8ffa4443d 100755 (executable)
@@ -46,8 +46,9 @@ class BaseSoC(SoCSDRAM):
                 write_latency=0
             )
             self.submodules.sdrphy = SDRAMPHYModel(sdram_module, phy_settings)
-            self.register_sdram(self.sdrphy, "minicon",
-                                sdram_module.geom_settings, sdram_module.timing_settings)
+            self.register_sdram(self.sdrphy,
+                                sdram_module.geom_settings,
+                                sdram_module.timing_settings)
             # reduce memtest size to speed up simulation
             self.add_constant("MEMTEST_DATA_SIZE", 8*1024)
             self.add_constant("MEMTEST_ADDR_SIZE", 8*1024)