digilent_pynq_z1: Do minor cosmetic cleanups.

This commit is contained in:
Florent Kermarrec 2022-01-14 09:39:42 +01:00
parent 45cfe2be6b
commit 296c99f065
2 changed files with 54 additions and 55 deletions

View file

@ -35,7 +35,7 @@ _io = [
("user_btn", 2, Pins("L20"), IOStandard("LVCMOS33")), ("user_btn", 2, Pins("L20"), IOStandard("LVCMOS33")),
("user_btn", 3, Pins("L19"), IOStandard("LVCMOS33")), ("user_btn", 3, Pins("L19"), IOStandard("LVCMOS33")),
#Serial # Serial
("serial", 0, ("serial", 0,
Subsignal("tx", Pins("pmoda:0")), Subsignal("tx", Pins("pmoda:0")),
Subsignal("rx", Pins("pmoda:1")), Subsignal("rx", Pins("pmoda:1")),
@ -73,8 +73,7 @@ _io = [
("ck_sda", 0, Pins("P15"), IOStandard("LVCMOS33")), ("ck_sda", 0, Pins("P15"), IOStandard("LVCMOS33")),
# Crypto SDA # Crypto SDA
("crypto_sda", 0, Pins("J15"), IOStandard("LVCMOS33")) ("crypto_sda", 0, Pins("J15"), IOStandard("LVCMOS33")),
] ]
_ps7_io = [ _ps7_io = [
@ -83,8 +82,8 @@ _ps7_io = [
("ps7_porb", 0, Pins("C7")), ("ps7_porb", 0, Pins("C7")),
("ps7_srstb", 0, Pins("B10")), ("ps7_srstb", 0, Pins("B10")),
("ps7_mio", 0, Pins( ("ps7_mio", 0, Pins(
"E6 A7 B8 D6 B7 A6 A5 D8", " E6 A7 B8 D6 B7 A6 A5 D8",
"D5 B5 E9 C6 D9 E8 C5 C8", " D5 B5 E9 C6 D9 E8 C5 C8",
"A19 E14 B18 D10 A17 F14 B17 D11", "A19 E14 B18 D10 A17 F14 B17 D11",
"A16 F15 A15 D13 C16 C13 C15 E16", "A16 F15 A15 D13 C16 C13 C15 E16",
"A14 D15 A12 F12 A11 A10 E13 C18" "A14 D15 A12 F12 A11 A10 E13 C18"
@ -102,10 +101,10 @@ _ps7_io = [
Subsignal("cs_n", Pins("N1")), Subsignal("cs_n", Pins("N1")),
Subsignal("dm", Pins("A1 F1 T1 Y1")), Subsignal("dm", Pins("A1 F1 T1 Y1")),
Subsignal("dq", Pins( Subsignal("dq", Pins(
" C3 B3 A2 A4 D3 D1 C1 E1", "C3 B3 A2 A4 D3 D1 C1 E1",
" E2 E3 G3 H3 J3 H2 H1 J1", "E2 E3 G3 H3 J3 H2 H1 J1",
" P1 P3 R3 R1 T4 U4 U2 U3", "P1 P3 R3 R1 T4 U4 U2 U3",
" V1 Y3 W1 Y4 Y2 W3 V2 V3"), "V1 Y3 W1 Y4 Y2 W3 V2 V3"),
), ),
Subsignal("dqs_n", Pins("B2 F2 T2 W4")), Subsignal("dqs_n", Pins("B2 F2 T2 W4")),
Subsignal("dqs_p", Pins("C2 G2 R2 W5")), Subsignal("dqs_p", Pins("C2 G2 R2 W5")),

8
litex_boards/targets/digilent_pynq_z1.py Normal file → Executable file
View file

@ -104,10 +104,10 @@ class BaseSoC(SoCCore):
def main(): def main():
parser = argparse.ArgumentParser(description="LiteX SoC on PYNQ Z1") parser = argparse.ArgumentParser(description="LiteX SoC on PYNQ Z1")
parser.add_argument("--build", action="store_true", help="Build bitstream") parser.add_argument("--build", action="store_true", help="Build bitstream.")
parser.add_argument("--load", action="store_true", help="Load bitstream") parser.add_argument("--load", action="store_true", help="Load bitstream.")
parser.add_argument("--sys-clk-freq", default=125e6, help="System clock frequency (default: 125MHz)") parser.add_argument("--sys-clk-freq", default=125e6, help="System clock frequency.")
parser.add_argument("--with-video-terminal", action="store_true", help="Enable Video Terminal (HDMI)") parser.add_argument("--with-video-terminal", action="store_true", help="Enable Video Terminal (HDMI).")
builder_args(parser) builder_args(parser)
soc_core_args(parser) soc_core_args(parser)