Hardware
/
litex-boards
mirror of https://github.com/litex-hub/litex-boards.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

platforms/digilent_zybo_z7: reorder _io_x & _connectors_x, init cleanup

This commit is contained in:
Gwenhael Goavec-Merou 2022-12-12 22:17:39 +01:00
parent d28894a4b3
commit a92fdffb35
1 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
litex_boards/platforms/digilent_zybo_z7.py
View File

@ -10,30 +10,6 @@ from litex.build.xilinx import Xilinx7SeriesPlatform, VivadoProgrammer
# IOs ---------------------------------------------------------------------------------------------- # IOs ----------------------------------------------------------------------------------------------
_io_z7 = [
# Clk / Rst
("clk125", 0, Pins("K17"), IOStandard("LVCMOS33")),
# Buttons
("user_btn", 0, Pins("K18"), IOStandard("LVCMOS33")),
("user_btn", 1, Pins("P16"), IOStandard("LVCMOS33")),
("user_btn", 2, Pins("K19"), IOStandard("LVCMOS33")),
("user_btn", 3, Pins("Y16"), IOStandard("LVCMOS33")),
]
_io_original = [
# Clk / Rst
("clk125", 0, Pins("L16"), IOStandard("LVCMOS33")),
# Buttons
("user_btn", 0, Pins("R18"), IOStandard("LVCMOS33")),
("user_btn", 1, Pins("P16"), IOStandard("LVCMOS33")),
("user_btn", 2, Pins("V16"), IOStandard("LVCMOS33")),
("user_btn", 3, Pins("Y16"), IOStandard("LVCMOS33")),
]
_io = [ _io = [
# Leds # Leds
("user_led", 0, Pins("M14"), IOStandard("LVCMOS33")), ("user_led", 0, Pins("M14"), IOStandard("LVCMOS33")),
@ -71,6 +47,28 @@ _io = [
), ),
] ]
_io_z7 = [
# Clk / Rst
("clk125", 0, Pins("K17"), IOStandard("LVCMOS33")),
# Buttons
("user_btn", 0, Pins("K18"), IOStandard("LVCMOS33")),
("user_btn", 1, Pins("P16"), IOStandard("LVCMOS33")),
("user_btn", 2, Pins("K19"), IOStandard("LVCMOS33")),
("user_btn", 3, Pins("Y16"), IOStandard("LVCMOS33")),
]
_io_original = [
# Clk / Rst
("clk125", 0, Pins("L16"), IOStandard("LVCMOS33")),
# Buttons
("user_btn", 0, Pins("R18"), IOStandard("LVCMOS33")),
("user_btn", 1, Pins("P16"), IOStandard("LVCMOS33")),
("user_btn", 2, Pins("V16"), IOStandard("LVCMOS33")),
("user_btn", 3, Pins("Y16"), IOStandard("LVCMOS33")),
]
_ps7_io = [ _ps7_io = [
# PS7 # PS7
("ps7_clk", 0, Pins(1)), ("ps7_clk", 0, Pins(1)),
@ -110,10 +108,6 @@ _usb_uart_pmod_io = [
# Connectors --------------------------------------------------------------------------------------- # Connectors ---------------------------------------------------------------------------------------
_connectors_z7 = [
("pmodb", "V8 W8 U7 V7 Y7 Y6 V6 W6")
]
_connectors = [ _connectors = [
("pmoda", "N15 L14 K16 K14 N16 L15 J16 J14"), # XADC ("pmoda", "N15 L14 K16 K14 N16 L15 J16 J14"), # XADC
("pmodc", "V15 W15 T11 T10 W14 Y14 T12 U12"), ("pmodc", "V15 W15 T11 T10 W14 Y14 T12 U12"),
@ -121,6 +115,10 @@ _connectors = [
("pmode", "V12 W16 J15 H15 V13 U17 T17 Y17"), ("pmode", "V12 W16 J15 H15 V13 U17 T17 Y17"),
] ]
_connectors_z7 = [
("pmodb", "V8 W8 U7 V7 Y7 Y6 V6 W6")
]
_connectors_original = [ _connectors_original = [
("pmodb", "T20 U20 V20 W20 Y18 Y19 W18 W19") ("pmodb", "T20 U20 V20 W20 Y18 Y19 W18 W19")
] ]
@ -148,6 +146,7 @@ ps7_config_variants = {
"PCW_UIPARAM_DDR_PARTNO" : "MT41K128M16 RE-125" "PCW_UIPARAM_DDR_PARTNO" : "MT41K128M16 RE-125"
} }
} }
# Platform ----------------------------------------------------------------------------------------- # Platform -----------------------------------------------------------------------------------------
class Platform(Xilinx7SeriesPlatform): class Platform(Xilinx7SeriesPlatform):
@ -161,17 +160,13 @@ class Platform(Xilinx7SeriesPlatform):
"original": "xc7z010-clg400-1" "original": "xc7z010-clg400-1"
}[variant] }[variant]
ps7_config = ps7_config_variants["common"] ps7_config = ps7_config_variants["common"]
if variant == "original": ps7_config.update(ps7_config_variants["original" if variant == "original" else "z7"])
_connectors = _connectors + _connectors_original
_io = _io + _io_original Xilinx7SeriesPlatform.__init__(self, device, _io, _connectors, toolchain=toolchain)
ps7_config.update(ps7_config_variants["original"])
else:
_connectors = _connectors + _connectors_z7
_io = _io + _io_z7
ps7_config.update(ps7_config_variants["z7"])
Xilinx7SeriesPlatform.__init__(self, device, _io, _connectors, toolchain=toolchain)
self.add_extension(_ps7_io) self.add_extension(_ps7_io)
self.add_extension(_usb_uart_pmod_io) self.add_extension(_usb_uart_pmod_io)
self.add_extension(_io_original if variant == "original" else _io_z7)
self.add_connector(_connectors_original if variant == "original" else _connectors_z7)
self.ps7_config = ps7_config self.ps7_config = ps7_config
def create_programmer(self): def create_programmer(self):