Get 3 DDR modules working with Vivado

This commit is contained in:
Hans Baier 2022-05-14 21:34:23 +07:00
parent f383ad3938
commit 006b54e7ea
2 changed files with 19 additions and 12 deletions

View file

@ -74,8 +74,8 @@ def _get_io(io_standard):
IOStandard("DIFF_SSTL15")), IOStandard("DIFF_SSTL15")),
Subsignal("dqs_n", Pins("A18 D23 G19 J21 K24 M19 M27 M30"), Subsignal("dqs_n", Pins("A18 D23 G19 J21 K24 M19 M27 M30"),
IOStandard("DIFF_SSTL15")), IOStandard("DIFF_SSTL15")),
Subsignal("clk_p", Pins("J26"), IOStandard("DIFF_SSTL15")), Subsignal("clk_p", Pins("J26"), IOStandard("DIFF_SSTL15"), Misc("IO_BUFFER_TYPE=NONE")),
Subsignal("clk_n", Pins("J27"), IOStandard("DIFF_SSTL15")), Subsignal("clk_n", Pins("J27"), IOStandard("DIFF_SSTL15"), Misc("IO_BUFFER_TYPE=NONE")),
Subsignal("cke", Pins("G25"), IOStandard("SSTL15")), Subsignal("cke", Pins("G25"), IOStandard("SSTL15")),
Subsignal("odt", Pins("J28"), IOStandard("SSTL15")), Subsignal("odt", Pins("J28"), IOStandard("SSTL15")),
Subsignal("reset_n", Pins("F27"), IOStandard("LVCMOS15")), Subsignal("reset_n", Pins("F27"), IOStandard("LVCMOS15")),
@ -119,14 +119,12 @@ def _get_io(io_standard):
Subsignal("rx_n", Pins("C11")), Subsignal("rx_n", Pins("C11")),
Subsignal("tx_p", Pins("A12")), Subsignal("tx_p", Pins("A12")),
Subsignal("tx_n", Pins("A11")), Subsignal("tx_n", Pins("A11")),
IOStandard("LVDS"),
), ),
("sata", 1, ("sata", 1,
Subsignal("rx_p", Pins("E12")), Subsignal("rx_p", Pins("E12")),
Subsignal("rx_n", Pins("E11")), Subsignal("rx_n", Pins("E11")),
Subsignal("tx_p", Pins("B10")), Subsignal("tx_p", Pins("B10")),
Subsignal("tx_n", Pins("B9")), Subsignal("tx_n", Pins("B9")),
IOStandard("LVDS"),
), ),
# PCIe # PCIe
@ -314,7 +312,7 @@ _connectors = [
# Platform ----------------------------------------------------------------------------------------- # Platform -----------------------------------------------------------------------------------------
class Platform(XilinxPlatform): class Platform(XilinxPlatform):
default_clk_name = "diffclk100" default_clk_name = "clk100"
default_clk_period = 1e9/100e6 default_clk_period = 1e9/100e6
def __init__(self, io_voltage="3.3V"): def __init__(self, io_voltage="3.3V"):
@ -322,10 +320,17 @@ class Platform(XilinxPlatform):
io_standard = IOStandard("LVCMOS33") if io_voltage == "3.3V" else IOStandard("LVCMOS25") io_standard = IOStandard("LVCMOS33") if io_voltage == "3.3V" else IOStandard("LVCMOS25")
_io = _get_io(io_standard) _io = _get_io(io_standard)
XilinxPlatform.__init__(self, "xc7k420t-ffg901-2", _io, _connectors, toolchain="ise") XilinxPlatform.__init__(self, "xc7k420t-ffg901-2", _io, _connectors, toolchain="vivado")
self.add_platform_command("""
set_property CONFIG_VOLTAGE 3.3 [current_design]
set_property CFGBVS VCCO [current_design]""")
self.add_platform_command("set_property INTERNAL_VREF 0.750 [get_iobanks 11]")
self.add_platform_command("set_property INTERNAL_VREF 0.750 [get_iobanks 12]")
self.add_platform_command("set_property INTERNAL_VREF 0.750 [get_iobanks 13]")
self.add_platform_command("set_property INTERNAL_VREF 0.750 [get_iobanks 16]")
self.add_platform_command("set_property INTERNAL_VREF 0.750 [get_iobanks 17]")
self.toolchain.bitstream_commands = [ self.toolchain.bitstream_commands = [
"set_property CONFIG_VOLTAGE 3.3 [current_design]",
"set_property CFGBVS VCCO [current_design]",
"set_property BITSTREAM.CONFIG.SPI_BUSWIDTH 4 [current_design]", "set_property BITSTREAM.CONFIG.SPI_BUSWIDTH 4 [current_design]",
"set_property BITSTREAM.GENERAL.COMPRESS TRUE [current_design]", "set_property BITSTREAM.GENERAL.COMPRESS TRUE [current_design]",
"set_property BITSTREAM.CONFIG.CCLK_TRISTATE TRUE [current_design]", "set_property BITSTREAM.CONFIG.CCLK_TRISTATE TRUE [current_design]",

View file

@ -25,8 +25,9 @@ from litex.soc.integration.builder import *
from litex.soc.cores.led import LedChaser from litex.soc.cores.led import LedChaser
from litex.soc.cores.bitbang import I2CMaster from litex.soc.cores.bitbang import I2CMaster
from litedram.modules import K4B1G0446F
from litedram.phy import s7ddrphy from litedram.phy import s7ddrphy
from litedram.common import PHYPadsReducer
from litedram.modules import K4B1G0446F
from litepcie.phy.s7pciephy import S7PCIEPHY from litepcie.phy.s7pciephy import S7PCIEPHY
from litepcie.software import generate_litepcie_software from litepcie.software import generate_litepcie_software
@ -44,7 +45,7 @@ class _CRG(Module):
# # # # # #
# Clk/Rst. # Clk/Rst.
clk100 = platform.request("diffclk100") clk100 = platform.request("clk100")
rst_n = platform.request("cpu_reset_n") rst_n = platform.request("cpu_reset_n")
# PLL. # PLL.
@ -79,7 +80,8 @@ class BaseSoC(SoCCore):
# DDR3 SDRAM ------------------------------------------------------------------------------- # DDR3 SDRAM -------------------------------------------------------------------------------
if not self.integrated_main_ram_size: if not self.integrated_main_ram_size:
# we need to use A7DDRPHY instead of K7DDRPHY, because the 420T has no ODELAYE2 # we need to use A7DDRPHY instead of K7DDRPHY, because the 420T has no ODELAYE2
self.submodules.ddrphy = s7ddrphy.A7DDRPHY(platform.request("ddram", 0), self.submodules.ddrphy = s7ddrphy.A7DDRPHY(
pads = PHYPadsReducer(platform.request("ddram", 0), [0, 1, 2]),
memtype = "DDR3", memtype = "DDR3",
nphases = 4, nphases = 4,
sys_clk_freq = sys_clk_freq, sys_clk_freq = sys_clk_freq,
@ -87,7 +89,7 @@ class BaseSoC(SoCCore):
) )
self.add_sdram("sdram", self.add_sdram("sdram",
phy = self.ddrphy, phy = self.ddrphy,
module = K4B1G0446F(sys_clk_freq, "1:4", "800"), module = K4B1G0446F(sys_clk_freq, "1:4", "1066"),
l2_cache_size = kwargs.get("l2_size", 8192), l2_cache_size = kwargs.get("l2_size", 8192),
) )