targets: remove sdram_controller_type parameter (minicon removed)

This commit is contained in:
Florent Kermarrec 2016-04-29 17:51:16 +02:00
parent 8c7332e75e
commit 3d71ba6e66
4 changed files with 11 additions and 8 deletions

View File

@ -98,8 +98,9 @@ class BaseSoC(SoCSDRAM):
if not self.integrated_main_ram_size: if not self.integrated_main_ram_size:
self.submodules.sdrphy = GENSDRPHY(platform.request("sdram"),) self.submodules.sdrphy = GENSDRPHY(platform.request("sdram"),)
sdram_module = IS42S16160(self.clk_freq, "1:1") sdram_module = IS42S16160(self.clk_freq, "1:1")
self.register_sdram(self.sdrphy, "minicon", self.register_sdram(self.sdrphy,
sdram_module.geom_settings, sdram_module.timing_settings) sdram_module.geom_settings,
sdram_module.timing_settings)
def main(): def main():
parser = argparse.ArgumentParser(description="LiteX SoC port to the Altera DE0 Nano") parser = argparse.ArgumentParser(description="LiteX SoC port to the Altera DE0 Nano")

View File

@ -84,7 +84,7 @@ class BaseSoC(SoCSDRAM):
} }
csr_map.update(SoCSDRAM.csr_map) 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) platform = kc705.Platform(toolchain=toolchain)
SoCSDRAM.__init__(self, platform, SoCSDRAM.__init__(self, platform,
clk_freq=125*1000000, cpu_reset_address=0xaf0000, clk_freq=125*1000000, cpu_reset_address=0xaf0000,
@ -95,7 +95,7 @@ class BaseSoC(SoCSDRAM):
if not self.integrated_main_ram_size: if not self.integrated_main_ram_size:
self.submodules.ddrphy = k7ddrphy.K7DDRPHY(platform.request("ddram")) self.submodules.ddrphy = k7ddrphy.K7DDRPHY(platform.request("ddram"))
sdram_module = MT8JTF12864(self.clk_freq, "1:4") 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) sdram_module.geom_settings, sdram_module.timing_settings)
if not self.integrated_rom_size: if not self.integrated_rom_size:

View File

@ -78,8 +78,9 @@ class BaseSoC(SoCSDRAM):
if not self.integrated_main_ram_size: if not self.integrated_main_ram_size:
self.submodules.sdrphy = GENSDRPHY(platform.request("sdram")) self.submodules.sdrphy = GENSDRPHY(platform.request("sdram"))
sdram_module = AS4C16M16(clk_freq, "1:1") sdram_module = AS4C16M16(clk_freq, "1:1")
self.register_sdram(self.sdrphy, "minicon", self.register_sdram(self.sdrphy,
sdram_module.geom_settings, sdram_module.timing_settings) sdram_module.geom_settings,
sdram_module.timing_settings)
def main(): def main():

View File

@ -46,8 +46,9 @@ class BaseSoC(SoCSDRAM):
write_latency=0 write_latency=0
) )
self.submodules.sdrphy = SDRAMPHYModel(sdram_module, phy_settings) self.submodules.sdrphy = SDRAMPHYModel(sdram_module, phy_settings)
self.register_sdram(self.sdrphy, "minicon", self.register_sdram(self.sdrphy,
sdram_module.geom_settings, sdram_module.timing_settings) sdram_module.geom_settings,
sdram_module.timing_settings)
# reduce memtest size to speed up simulation # reduce memtest size to speed up simulation
self.add_constant("MEMTEST_DATA_SIZE", 8*1024) self.add_constant("MEMTEST_DATA_SIZE", 8*1024)
self.add_constant("MEMTEST_ADDR_SIZE", 8*1024) self.add_constant("MEMTEST_ADDR_SIZE", 8*1024)