platforms/targets: sync with litex

This commit is contained in:
Florent Kermarrec 2020-01-09 21:10:59 +01:00
parent 4192b20f09
commit 7afe3dc674
2 changed files with 6 additions and 9 deletions

View file

@ -73,14 +73,11 @@ _io = [
IOStandard("LVCMOS33"), Drive(8), Misc("SLEW=FAST") IOStandard("LVCMOS33"), Drive(8), Misc("SLEW=FAST")
), ),
("sd", 0, ("sdcard", 0,
Subsignal("sck", Pins("L12")), Subsignal("data", Pins("M10 L10 J11 K12"), Misc("PULLUP")),
Subsignal("d3", Pins("K12")), Subsignal("cmd", Pins("K11"), Misc("PULLUP")),
Subsignal("d", Pins("M10")), Subsignal("clk", Pins("L12")),
Subsignal("d1", Pins("L10")), IOStandard("LVCMOS33"), Misc("SLEW=FAST")
Subsignal("d2", Pins("J11")),
Subsignal("cmd", Pins("K11")),
IOStandard("LVCMOS33")
), ),
("dvi_in", 0, ("dvi_in", 0,
@ -118,6 +115,7 @@ class Platform(XilinxPlatform):
default_clk_period = 1e9/32e6 default_clk_period = 1e9/32e6
def __init__(self, device="xc6slx25"): def __init__(self, device="xc6slx25"):
assert device in ["xc6slx9", "xc6slx25"]
XilinxPlatform.__init__(self, device+"-3-ftg256", _io, _connectors) XilinxPlatform.__init__(self, device+"-3-ftg256", _io, _connectors)
def create_programmer(self): def create_programmer(self):

View file

@ -68,7 +68,6 @@ class BaseSoC(SoCSDRAM):
self.register_sdram(self.ddrphy, self.register_sdram(self.ddrphy,
geom_settings = sdram_module.geom_settings, geom_settings = sdram_module.geom_settings,
timing_settings = sdram_module.timing_settings) timing_settings = sdram_module.timing_settings)
self.add_constant("MEMTEST_ADDR_SIZE", 0) # FIXME
# EthernetSoC -------------------------------------------------------------------------------------- # EthernetSoC --------------------------------------------------------------------------------------