From 2becaaabfc558f57bed7ec62f0230f1f6f7a3633 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Tue, 27 Jul 2021 12:28:04 +0200 Subject: [PATCH] pr243: Minor platform cleanups. --- litex_boards/platforms/digilent_cmod_a7.py | 20 ++++----- litex_boards/platforms/digilent_nexys4.py | 44 ++++++++++---------- litex_boards/platforms/micronova_mercury2.py | 13 ++++-- 3 files changed, 42 insertions(+), 35 deletions(-) diff --git a/litex_boards/platforms/digilent_cmod_a7.py b/litex_boards/platforms/digilent_cmod_a7.py index ea1e7bc..5bfdcb0 100644 --- a/litex_boards/platforms/digilent_cmod_a7.py +++ b/litex_boards/platforms/digilent_cmod_a7.py @@ -16,9 +16,9 @@ _io = [ # Clk / Rst ("clk12", 0, Pins("L17"), IOStandard("LVCMOS33")), - ## Buttons + # Buttons ("cpu_reset", 0, Pins("A18"), IOStandard("LVCMOS33")), - ("user_btn", 0, Pins("B18"), IOStandard("LVCMOS33")), + ("user_btn", 0, Pins("B18"), IOStandard("LVCMOS33")), # Leds ("user_led", 0, Pins("A17"), IOStandard("LVCMOS33")), @@ -37,22 +37,20 @@ _io = [ Subsignal("rx", Pins("J17")), IOStandard("LVCMOS33")), + # SRAM ("issiram", 0, - Subsignal( - "addr", - Pins("M18 M19 K17 N17 P17 P18 R18 W19", - "U19 V19 W18 T17 T18 U17 U18 V16", - "W16 W17 V15"), + Subsignal("addr", Pins( + "M18 M19 K17 N17 P17 P18 R18 W19", + "U19 V19 W18 T17 T18 U17 U18 V16", + "W16 W17 V15"), IOStandard("LVCMOS33")), - Subsignal( - "data", - Pins("W15 W13 W14 U15 U16 V13 V14 U14"), + Subsignal("data", Pins( + "W15 W13 W14 U15 U16 V13 V14 U14"), IOStandard("LVCMOS33")), Subsignal("wen", Pins("R19"), IOStandard("LVCMOS33")), Subsignal("cen", Pins("N19"), IOStandard("LVCMOS33")), Misc("SLEW=FAST"), ), - ] # Connectors --------------------------------------------------------------------------------------- diff --git a/litex_boards/platforms/digilent_nexys4.py b/litex_boards/platforms/digilent_nexys4.py index c1a6c91..c9d910f 100644 --- a/litex_boards/platforms/digilent_nexys4.py +++ b/litex_boards/platforms/digilent_nexys4.py @@ -13,7 +13,7 @@ from litex.build.openocd import OpenOCD _io = [ # Clk / Rst - ("clk100", 0, Pins("E3"), IOStandard("LVCMOS33")), + ("clk100", 0, Pins("E3"), IOStandard("LVCMOS33")), ("cpu_reset", 0, Pins("C12"), IOStandard("LVCMOS33")), # Leds @@ -118,24 +118,26 @@ _io = [ IOStandard("LVCMOS33"), ), + # SRAM ("cellularram", 0, - Subsignal( - "addr", - Pins("J18 H17 H15 J17 H16 K15 K13 N15 V16 U14 V14 V12 P14 U16 R15 N14 N16 M13 V17 U17 T10 M16 U13"), - ), - Subsignal( - "data", - Pins("R12 T11 U12 R13 U18 R17 T18 R18 F18 G18 G17 M18 M17 P18 N17 P17"), - ), - Subsignal("oen", Pins("H14")), - Subsignal("wen", Pins("R11")), - Subsignal("clk", Pins("T15")), - Subsignal("adv", Pins("T13")), + Subsignal("addr", Pins( + "J18 H17 H15 J17 H16 K15 K13 N15", + "V16 U14 V14 V12 P14 U16 R15 N14", + "N16 M13 V17 U17 T10 M16 U13"), + ), + Subsignal("data", Pins( + "R12 T11 U12 R13 U18 R17 T18 R18", + "F18 G18 G17 M18 M17 P18 N17 P17"), + ), + Subsignal("oen", Pins("H14")), + Subsignal("wen", Pins("R11")), + Subsignal("clk", Pins("T15")), + Subsignal("adv", Pins("T13")), Subsignal("wait", Pins("T14")), - Subsignal("cen", Pins("L18")), - Subsignal("ub", Pins("J13")), - Subsignal("lb", Pins("J15")), - Subsignal("cre", Pins("J14")), + Subsignal("cen", Pins("L18")), + Subsignal("ub", Pins("J13")), + Subsignal("lb", Pins("J15")), + Subsignal("cre", Pins("J14")), Misc("SLEW=FAST"), IOStandard("LVCMOS33"), ), @@ -179,10 +181,10 @@ _io = [ # Connectors --------------------------------------------------------------------------------------- _connectors = [ - ("pmoda", "B13 F14 D17 E17 G13 C17 D18 E18"), - ("pmodb", "G14 P15 V11 V15 K16 R16 T9 U11"), - ("pmodc", "K2 E7 J3 J4 K1 E6 J2 G6"), - ("pmodd", "H4 H1 G1 G3 H2 G4 G2 F3"), + ("pmoda", "B13 F14 D17 E17 G13 C17 D18 E18"), + ("pmodb", "G14 P15 V11 V15 K16 R16 T9 U11"), + ("pmodc", "K2 E7 J3 J4 K1 E6 J2 G6"), + ("pmodd", "H4 H1 G1 G3 H2 G4 G2 F3"), ("pmodxdac", "A13 A15 B16 B18 A14 A16 B17 A18"), ] diff --git a/litex_boards/platforms/micronova_mercury2.py b/litex_boards/platforms/micronova_mercury2.py index d787ff9..f35d2b0 100644 --- a/litex_boards/platforms/micronova_mercury2.py +++ b/litex_boards/platforms/micronova_mercury2.py @@ -17,7 +17,7 @@ _io = [ ("clk50", 0, Pins("N14"), IOStandard("LVCMOS33")), # Leds - ("user_led", 0, Pins("M1"), IOStandard("LVCMOS33")), + ("user_led", 0, Pins("M1"), IOStandard("LVCMOS33")), ("user_led", 1, Pins("A14"), IOStandard("LVCMOS33")), ("user_led", 2, Pins("A13"), IOStandard("LVCMOS33")), @@ -28,9 +28,16 @@ _io = [ IOStandard("LVCMOS33") ), + # SRAM ("issiram", 0, - Subsignal("addr", Pins("M4 N3 N4 P3 M5 E5 D5 D3 B7 B4 J4 H4 H3 G4 E6 A7 A5 A4 C4"), IOStandard("LVCMOS33")), - Subsignal("data", Pins("L5 L3 L4 R2 F3 F4 E3 D6"), IOStandard("LVCMOS33")), + Subsignal("addr", Pins( + "M4 N3 N4 P3 M5 E5 D5 D3", + "B7 B4 J4 H4 H3 G4 E6 A7", + "A5 A4 C4"), + IOStandard("LVCMOS33")), + Subsignal("data", Pins( + "L5 L3 L4 R2 F3 F4 E3 D6"), + IOStandard("LVCMOS33")), Subsignal("wen", Pins("R1"), IOStandard("LVCMOS33")), Subsignal("cen", Pins("M6"), IOStandard("LVCMOS33")), Misc("SLEW=FAST"),