diff --git a/litex_boards/platforms/mercury_xu5.py b/litex_boards/platforms/mercury_xu5.py index d32647f..e738572 100644 --- a/litex_boards/platforms/mercury_xu5.py +++ b/litex_boards/platforms/mercury_xu5.py @@ -4,119 +4,119 @@ from litex.build.xilinx import XilinxPlatform, VivadoProgrammer # IOs ---------------------------------------------------------------------------------------------- _io = [ - ('clk100', 0, - Subsignal('n', Pins('AD4'), IOStandard('DIFF_SSTL12_DCI')), - Subsignal('p', Pins('AD5'), IOStandard('DIFF_SSTL12_DCI')), + ("clk100", 0, + Subsignal("n", Pins("AD4"), IOStandard("DIFF_SSTL12_DCI")), + Subsignal("p", Pins("AD5"), IOStandard("DIFF_SSTL12_DCI")), ), - ('clk100_gtr', 0, - Subsignal('p', Pins('C21'), IOStandard('DIFF_SSTL12')), - Subsignal('n', Pins('C22'), IOStandard('DIFF_SSTL12')), + ("clk100_gtr", 0, + Subsignal("p", Pins("C21"), IOStandard("DIFF_SSTL12")), + Subsignal("n", Pins("C22"), IOStandard("DIFF_SSTL12")), ), - ('clk27_gtr', 0, - Subsignal('p', Pins('A21'), IOStandard('DIFF_SSTL12')), - Subsignal('n', Pins('A22'), IOStandard('DIFF_SSTL12')), + ("clk27_gtr", 0, + Subsignal("p", Pins("A21"), IOStandard("DIFF_SSTL12")), + Subsignal("n", Pins("A22"), IOStandard("DIFF_SSTL12")), ), - ('clk33', 0, Pins('AD4'), IOStandard('SSTL12')), + ("clk33", 0, Pins("AD4"), IOStandard("SSTL12")), - ('cpu_reset', 0, Pins('N19'), IOStandard('LVCMOS33')), + ("cpu_reset", 0, Pins("N19"), IOStandard("LVCMOS33")), - ('user_led', 0, Pins('H2'), IOStandard('LVCMOS18')), - ('user_led', 1, Pins('P9'), IOStandard('LVCMOS18')), - ('user_led', 2, Pins('K5'), IOStandard('LVCMOS18')), + ("user_led", 0, Pins("H2"), IOStandard("LVCMOS18")), + ("user_led", 1, Pins("P9"), IOStandard("LVCMOS18")), + ("user_led", 2, Pins("K5"), IOStandard("LVCMOS18")), - ('serial', 0, - Subsignal('rx', Pins('AA10')), # Module connector A: A60 (Meccury PE1: "IO B" connector 32) - Subsignal('tx', Pins('AA11')), # Module connector A: A58 (Meccury PE1: "IO B" connector 31) - IOStandard('LVCMOS33'), + ("serial", 0, + Subsignal("rx", Pins("AA10")), # Module connector A: A60 (Meccury PE1: "IO B" connector 32) + Subsignal("tx", Pins("AA11")), # Module connector A: A58 (Meccury PE1: "IO B" connector 31) + IOStandard("LVCMOS33"), ), - ('ddram', 0, # TODO: remove Misc with default settings - Subsignal('a', Pins( - 'AC4 AC3 AB4 AB3 AB2 AC2 AB1 AC1', - 'AB5 AG4 AH4 AG3 AH3 AE3'), IOStandard('SSTL12_DCI'), - Misc('OUTPUT_IMPEDANCE=RDRV_40_40'), - Misc('DATA_RATE=DDR'), + ("ddram", 0, # TODO: remove Misc with default settings + Subsignal("a", Pins( + "AC4 AC3 AB4 AB3 AB2 AC2 AB1 AC1", + "AB5 AG4 AH4 AG3 AH3 AE3"), IOStandard("SSTL12_DCI"), + Misc("OUTPUT_IMPEDANCE=RDRV_40_40"), + Misc("DATA_RATE=DDR"), ), - Subsignal('we_n', Pins('AF3'), IOStandard('SSTL12_DCI'), # A14 - Misc('OUTPUT_IMPEDANCE=RDRV_40_40'), - Misc('DATA_RATE=DDR'), + Subsignal("we_n", Pins("AF3"), IOStandard("SSTL12_DCI"), # A14 + Misc("OUTPUT_IMPEDANCE=RDRV_40_40"), + Misc("DATA_RATE=DDR"), ), - Subsignal('cas_n', Pins('AE2'), IOStandard('SSTL12_DCI'), # A15 - Misc('OUTPUT_IMPEDANCE=RDRV_40_40'), - Misc('DATA_RATE=DDR'), + Subsignal("cas_n", Pins("AE2"), IOStandard("SSTL12_DCI"), # A15 + Misc("OUTPUT_IMPEDANCE=RDRV_40_40"), + Misc("DATA_RATE=DDR"), ), - Subsignal('ras_n', Pins('AF2'), IOStandard('SSTL12_DCI'), # A16 - Misc('OUTPUT_IMPEDANCE=RDRV_40_40'), - Misc('DATA_RATE=DDR'), + Subsignal("ras_n", Pins("AF2"), IOStandard("SSTL12_DCI"), # A16 + Misc("OUTPUT_IMPEDANCE=RDRV_40_40"), + Misc("DATA_RATE=DDR"), ), - Subsignal('ba', Pins('AH1 AF1'), IOStandard('SSTL12_DCI'), - Misc('OUTPUT_IMPEDANCE=RDRV_40_40'), - Misc('DATA_RATE=DDR'), + Subsignal("ba", Pins("AH1 AF1"), IOStandard("SSTL12_DCI"), + Misc("OUTPUT_IMPEDANCE=RDRV_40_40"), + Misc("DATA_RATE=DDR"), ), - # Subsignal('bg', Pins('AG1 AD9'), IOStandard('SSTL12_DCI'), - Subsignal('bg', Pins('AG1'), IOStandard('SSTL12_DCI'), - Misc('OUTPUT_IMPEDANCE=RDRV_40_40'), - Misc('DATA_RATE=DDR'), + # Subsignal("bg", Pins("AG1 AD9"), IOStandard("SSTL12_DCI"), + Subsignal("bg", Pins("AG1"), IOStandard("SSTL12_DCI"), + Misc("OUTPUT_IMPEDANCE=RDRV_40_40"), + Misc("DATA_RATE=DDR"), ), - Subsignal('cs_n', Pins('AH9'), IOStandard('SSTL12_DCI'), - Misc('OUTPUT_IMPEDANCE=RDRV_40_40'), - Misc('DATA_RATE=SDR'), + Subsignal("cs_n", Pins("AH9"), IOStandard("SSTL12_DCI"), + Misc("OUTPUT_IMPEDANCE=RDRV_40_40"), + Misc("DATA_RATE=SDR"), ), - Subsignal('act_n', Pins('AH2'), IOStandard('SSTL12_DCI'), - Misc('OUTPUT_IMPEDANCE=RDRV_40_40'), - Misc('DATA_RATE=DDR'), + Subsignal("act_n", Pins("AH2"), IOStandard("SSTL12_DCI"), + Misc("OUTPUT_IMPEDANCE=RDRV_40_40"), + Misc("DATA_RATE=DDR"), ), - Subsignal('dm', Pins('AC9 AG9'), IOStandard('POD12_DCI'), - Misc('OUTPUT_IMPEDANCE=RDRV_40_40'), - # Misc('EQUALIZATION=EQ_LEVEL2'), - Misc('DATA_RATE=DDR'), + Subsignal("dm", Pins("AC9 AG9"), IOStandard("POD12_DCI"), + Misc("OUTPUT_IMPEDANCE=RDRV_40_40"), + # Misc("EQUALIZATION=EQ_LEVEL2"), + Misc("DATA_RATE=DDR"), ), - Subsignal('dq', Pins( - 'AB6 AC6 AE9 AE8 AB8 AC8 AB7 AC7', - 'AE5 AF5 AF8 AG8 AH8 AH7 AF7 AF6'), IOStandard('POD12_DCI'), - Misc('PRE_EMPHASIS=RDRV_240'), - Misc('EQUALIZATION=EQ_LEVEL2'), - Misc('OUTPUT_IMPEDANCE=RDRV_40_40'), - Misc('DATA_RATE=DDR'), - Misc('ODT=RTT_40'), + Subsignal("dq", Pins( + "AB6 AC6 AE9 AE8 AB8 AC8 AB7 AC7", + "AE5 AF5 AF8 AG8 AH8 AH7 AF7 AF6"), IOStandard("POD12_DCI"), + Misc("PRE_EMPHASIS=RDRV_240"), + Misc("EQUALIZATION=EQ_LEVEL2"), + Misc("OUTPUT_IMPEDANCE=RDRV_40_40"), + Misc("DATA_RATE=DDR"), + Misc("ODT=RTT_40"), ), - Subsignal('dqs_p', Pins('AD7 AG6'), IOStandard('DIFF_POD12_DCI'), - Misc('PRE_EMPHASIS=RDRV_240'), - Misc('EQUALIZATION=EQ_LEVEL2'), - Misc('OUTPUT_IMPEDANCE=RDRV_40_40'), - Misc('DATA_RATE=DDR'), - Misc('ODT=RTT_40'), + Subsignal("dqs_p", Pins("AD7 AG6"), IOStandard("DIFF_POD12_DCI"), + Misc("PRE_EMPHASIS=RDRV_240"), + Misc("EQUALIZATION=EQ_LEVEL2"), + Misc("OUTPUT_IMPEDANCE=RDRV_40_40"), + Misc("DATA_RATE=DDR"), + Misc("ODT=RTT_40"), ), - Subsignal('dqs_n', Pins('AE7 AG5'), IOStandard('DIFF_POD12_DCI'), - Misc('PRE_EMPHASIS=RDRV_240'), - Misc('EQUALIZATION=EQ_LEVEL2'), - Misc('OUTPUT_IMPEDANCE=RDRV_40_40'), - Misc('DATA_RATE=DDR'), - Misc('ODT=RTT_40'), + Subsignal("dqs_n", Pins("AE7 AG5"), IOStandard("DIFF_POD12_DCI"), + Misc("PRE_EMPHASIS=RDRV_240"), + Misc("EQUALIZATION=EQ_LEVEL2"), + Misc("OUTPUT_IMPEDANCE=RDRV_40_40"), + Misc("DATA_RATE=DDR"), + Misc("ODT=RTT_40"), ), - Subsignal('clk_p', Pins('AD2'), IOStandard('DIFF_SSTL12_DCI'), - Misc('OUTPUT_IMPEDANCE=RDRV_40_40'), - Misc('DATA_RATE=DDR'), + Subsignal("clk_p", Pins("AD2"), IOStandard("DIFF_SSTL12_DCI"), + Misc("OUTPUT_IMPEDANCE=RDRV_40_40"), + Misc("DATA_RATE=DDR"), ), - Subsignal('clk_n', Pins('AD1'), IOStandard('DIFF_SSTL12_DCI'), - Misc('OUTPUT_IMPEDANCE=RDRV_40_40'), - Misc('DATA_RATE=DDR'), + Subsignal("clk_n", Pins("AD1"), IOStandard("DIFF_SSTL12_DCI"), + Misc("OUTPUT_IMPEDANCE=RDRV_40_40"), + Misc("DATA_RATE=DDR"), ), - Subsignal('cke', Pins('AH6'), IOStandard('SSTL12_DCI'), - Misc('OUTPUT_IMPEDANCE=RDRV_40_40'), - Misc('DATA_RATE=DDR'), + Subsignal("cke", Pins("AH6"), IOStandard("SSTL12_DCI"), + Misc("OUTPUT_IMPEDANCE=RDRV_40_40"), + Misc("DATA_RATE=DDR"), ), - Subsignal('odt', Pins('AE4'), IOStandard('SSTL12_DCI'), - Misc('OUTPUT_IMPEDANCE=RDRV_40_40'), - Misc('DATA_RATE=DDR'), + Subsignal("odt", Pins("AE4"), IOStandard("SSTL12_DCI"), + Misc("OUTPUT_IMPEDANCE=RDRV_40_40"), + Misc("DATA_RATE=DDR"), ), - Subsignal('reset_n', Pins('G4'), IOStandard('LVCMOS18'), - Misc('DRIVE=8'), + Subsignal("reset_n", Pins("G4"), IOStandard("LVCMOS18"), + Misc("DRIVE=8"), ), - Misc('SLEW=FAST'), + Misc("SLEW=FAST"), ), ] @@ -127,17 +127,17 @@ _connectors = [] # Platform ----------------------------------------------------------------------------------------- class Platform(XilinxPlatform): - default_clk_name = 'clk100' + default_clk_name = "clk100" default_clk_period = 1e9/100e6 def __init__(self): - XilinxPlatform.__init__(self, 'xczu2eg-sfvc784-1-i', _io, _connectors, toolchain='vivado') + XilinxPlatform.__init__(self, "xczu2eg-sfvc784-1-i", _io, _connectors, toolchain="vivado") def create_programmer(self): return VivadoProgrammer() def do_finalize(self, fragment): XilinxPlatform.do_finalize(self, fragment) - self.add_platform_command('set_property BITSTREAM.CONFIG.OVERTEMPSHUTDOWN ENABLE [current_design]') - self.add_platform_command('set_property BITSTREAM.CONFIG.UNUSEDPIN PULLNONE [current_design]') - self.add_platform_command('set_property INTERNAL_VREF 0.600 [get_iobanks 64]') + self.add_platform_command("set_property BITSTREAM.CONFIG.OVERTEMPSHUTDOWN ENABLE [current_design]") + self.add_platform_command("set_property BITSTREAM.CONFIG.UNUSEDPIN PULLNONE [current_design]") + self.add_platform_command("set_property INTERNAL_VREF 0.600 [get_iobanks 64]")