Commit c093d0d0 authored by Florent Kermarrec's avatar Florent Kermarrec

platforms: cleanup pass to uniformize comments/separators/orders.

parent 8d26c241
...@@ -11,23 +11,24 @@ from litex.build.openocd import OpenOCD ...@@ -11,23 +11,24 @@ from litex.build.openocd import OpenOCD
# IOs ---------------------------------------------------------------------------------------------- # IOs ----------------------------------------------------------------------------------------------
_io = [ _io = [
("user_led", 0, Pins("M26"), IOStandard("LVCMOS33")), # Clk / Rst
("user_led", 1, Pins("T24"), IOStandard("LVCMOS33")),
("user_led", 2, Pins("T25"), IOStandard("LVCMOS33")),
("user_led", 3, Pins("R26"), IOStandard("LVCMOS33")),
("cpu_reset", 0, Pins("U4"), IOStandard("SSTL15")),
("clk200", 0, ("clk200", 0,
Subsignal("p", Pins("R3"), IOStandard("DIFF_SSTL15")), Subsignal("p", Pins("R3"), IOStandard("DIFF_SSTL15")),
Subsignal("n", Pins("P3"), IOStandard("DIFF_SSTL15")) Subsignal("n", Pins("P3"), IOStandard("DIFF_SSTL15"))
), ),
("clk156", 0, ("clk156", 0,
Subsignal("p", Pins("M21"), IOStandard("LVDS_25")), Subsignal("p", Pins("M21"), IOStandard("LVDS_25")),
Subsignal("n", Pins("M22"), IOStandard("LVDS_25")) Subsignal("n", Pins("M22"), IOStandard("LVDS_25"))
), ),
("cpu_reset", 0, Pins("U4"), IOStandard("SSTL15")),
# Leds
("user_led", 0, Pins("M26"), IOStandard("LVCMOS33")),
("user_led", 1, Pins("T24"), IOStandard("LVCMOS33")),
("user_led", 2, Pins("T25"), IOStandard("LVCMOS33")),
("user_led", 3, Pins("R26"), IOStandard("LVCMOS33")),
# Serial
("serial", 0, ("serial", 0,
Subsignal("cts", Pins("V19")), Subsignal("cts", Pins("V19")),
Subsignal("rts", Pins("W19")), Subsignal("rts", Pins("W19")),
...@@ -36,12 +37,12 @@ _io = [ ...@@ -36,12 +37,12 @@ _io = [
IOStandard("LVCMOS18") IOStandard("LVCMOS18")
), ),
# RGMII Ethernet
("eth_clocks", 0, ("eth_clocks", 0,
Subsignal("tx", Pins("U22")), Subsignal("tx", Pins("U22")),
Subsignal("rx", Pins("U21")), Subsignal("rx", Pins("U21")),
IOStandard("LVCMOS18") IOStandard("LVCMOS18")
), ),
("eth", 0, ("eth", 0,
Subsignal("rx_ctl", Pins("U14")), Subsignal("rx_ctl", Pins("U14")),
Subsignal("rx_data", Pins("U17 V17 V16 V14")), Subsignal("rx_data", Pins("U17 V17 V16 V14")),
...@@ -55,6 +56,7 @@ _io = [ ...@@ -55,6 +56,7 @@ _io = [
IOStandard("LVCMOS18"), IOStandard("LVCMOS18"),
), ),
# DDR3 SDRAM
("ddram", 0, ("ddram", 0,
Subsignal("a", Pins( Subsignal("a", Pins(
"M4 J3 J1 L4 K5 M7 K1 M6", "M4 J3 J1 L4 K5 M7 K1 M6",
...@@ -90,6 +92,7 @@ _io = [ ...@@ -90,6 +92,7 @@ _io = [
Misc("SLEW=FAST"), Misc("SLEW=FAST"),
), ),
# PCIe
("pcie_x1", 0, ("pcie_x1", 0,
Subsignal("rst_n", Pins("M20"), IOStandard("LVCMOS25")), Subsignal("rst_n", Pins("M20"), IOStandard("LVCMOS25")),
Subsignal("clk_p", Pins("F11")), Subsignal("clk_p", Pins("F11")),
...@@ -100,13 +103,13 @@ _io = [ ...@@ -100,13 +103,13 @@ _io = [
Subsignal("tx_n", Pins("C10")) Subsignal("tx_n", Pins("C10"))
), ),
("vadj_on_b", 0, Pins("R16"), IOStandard("LVCMOS25")), # GTP RefClk
("gtp_refclk", 0, ("gtp_refclk", 0,
Subsignal("p", Pins("AA13")), Subsignal("p", Pins("AA13")),
Subsignal("n", Pins("AB13")) Subsignal("n", Pins("AB13"))
), ),
# SFP
("sfp", 0, ("sfp", 0,
Subsignal("txp", Pins("AC10")), Subsignal("txp", Pins("AC10")),
Subsignal("txn", Pins("AD10")), Subsignal("txn", Pins("AD10")),
...@@ -117,6 +120,10 @@ _io = [ ...@@ -117,6 +120,10 @@ _io = [
("sfp_mgt_clk_sel1", 0, Pins("C24"), IOStandard("LVCMOS25")), ("sfp_mgt_clk_sel1", 0, Pins("C24"), IOStandard("LVCMOS25")),
("sfp_tx_disable_n", 0, Pins("R18"), IOStandard("LVCMOS33")), ("sfp_tx_disable_n", 0, Pins("R18"), IOStandard("LVCMOS33")),
("sfp_rx_los", 0, Pins("R23"), IOStandard("LVCMOS33")), ("sfp_rx_los", 0, Pins("R23"), IOStandard("LVCMOS33")),
# Others
("vadj_on_b", 0, Pins("R16"), IOStandard("LVCMOS25")),
] ]
# Connectors --------------------------------------------------------------------------------------- # Connectors ---------------------------------------------------------------------------------------
......
...@@ -14,19 +14,19 @@ from litex.build.openocd import OpenOCD ...@@ -14,19 +14,19 @@ from litex.build.openocd import OpenOCD
# IOs ---------------------------------------------------------------------------------------------- # IOs ----------------------------------------------------------------------------------------------
_io = [ _io = [
# clk / rst # Clk / Rst
("clk200", 0, ("clk200", 0,
Subsignal("p", Pins("J19"), IOStandard("DIFF_SSTL15")), Subsignal("p", Pins("J19"), IOStandard("DIFF_SSTL15")),
Subsignal("n", Pins("H19"), IOStandard("DIFF_SSTL15")) Subsignal("n", Pins("H19"), IOStandard("DIFF_SSTL15"))
), ),
# leds # Leds
("user_led", 0, Pins("G3"), IOStandard("LVCMOS33")), ("user_led", 0, Pins("G3"), IOStandard("LVCMOS33")),
("user_led", 1, Pins("H3"), IOStandard("LVCMOS33")), ("user_led", 1, Pins("H3"), IOStandard("LVCMOS33")),
("user_led", 2, Pins("G4"), IOStandard("LVCMOS33")), ("user_led", 2, Pins("G4"), IOStandard("LVCMOS33")),
("user_led", 3, Pins("H4"), IOStandard("LVCMOS33")), ("user_led", 3, Pins("H4"), IOStandard("LVCMOS33")),
# spiflash # SPIFlash
("spiflash", 0, ("spiflash", 0,
Subsignal("cs_n", Pins("T19")), Subsignal("cs_n", Pins("T19")),
Subsignal("mosi", Pins("P22")), Subsignal("mosi", Pins("P22")),
...@@ -36,7 +36,7 @@ _io = [ ...@@ -36,7 +36,7 @@ _io = [
IOStandard("LVCMOS33") IOStandard("LVCMOS33")
), ),
# pcie # PCIe
("pcie_clkreq_n", 0, Pins("G1"), IOStandard("LVCMOS33")), ("pcie_clkreq_n", 0, Pins("G1"), IOStandard("LVCMOS33")),
("pcie_x4", 0, ("pcie_x4", 0,
Subsignal("rst_n", Pins("J1"), IOStandard("LVCMOS33"), Misc("PULLUP=TRUE")), Subsignal("rst_n", Pins("J1"), IOStandard("LVCMOS33"), Misc("PULLUP=TRUE")),
...@@ -48,7 +48,7 @@ _io = [ ...@@ -48,7 +48,7 @@ _io = [
Subsignal("tx_n", Pins("A6 A4 C5 C7")), Subsignal("tx_n", Pins("A6 A4 C5 C7")),
), ),
# dram # DDR3 SDRAM
("ddram", 0, ("ddram", 0,
Subsignal("a", Pins( Subsignal("a", Pins(
"M15 L21 M16 L18 K21 M18 M21 N20", "M15 L21 M16 L18 K21 M18 M21 N20",
......
...@@ -12,15 +12,15 @@ from litex.build.openocd import OpenOCD ...@@ -12,15 +12,15 @@ from litex.build.openocd import OpenOCD
# IOs ---------------------------------------------------------------------------------------------- # IOs ----------------------------------------------------------------------------------------------
_io = [ _io = [
# clk / rst # Clk / Rst
("clk100", 0, Pins("W19"), IOStandard("LVCMOS33")), ("clk100", 0, Pins("W19"), IOStandard("LVCMOS33")),
# leds (only a single rgb led, aliased here also) # Leds (only a single rgb led, aliased here also)
("user_led", 0, Pins("AB21"), IOStandard("LVCMOS33")), ("user_led", 0, Pins("AB21"), IOStandard("LVCMOS33")),
("user_led", 1, Pins("AB22"), IOStandard("LVCMOS33")), ("user_led", 1, Pins("AB22"), IOStandard("LVCMOS33")),
("user_led", 2, Pins("U20"), IOStandard("LVCMOS33")), ("user_led", 2, Pins("U20"), IOStandard("LVCMOS33")),
# rgb led, active-low # RGB led, active-low
("rgb_led", 0, ("rgb_led", 0,
Subsignal("r", Pins("AB21")), Subsignal("r", Pins("AB21")),
Subsignal("g", Pins("AB22")), Subsignal("g", Pins("AB22")),
...@@ -28,7 +28,7 @@ _io = [ ...@@ -28,7 +28,7 @@ _io = [
IOStandard("LVCMOS33"), IOStandard("LVCMOS33"),
), ),
# flash # SPIFlash
("flash", 0, ("flash", 0,
Subsignal("cs_n", Pins("T19")), Subsignal("cs_n", Pins("T19")),
Subsignal("mosi", Pins("P22")), Subsignal("mosi", Pins("P22")),
...@@ -37,14 +37,13 @@ _io = [ ...@@ -37,14 +37,13 @@ _io = [
Subsignal("rst_n", Pins("R19")), Subsignal("rst_n", Pins("R19")),
IOStandard("LVCMOS33") IOStandard("LVCMOS33")
), ),
("flash4x", 0, # clock needs to be accessed through STARTUPE2 ("flash4x", 0, # clock needs to be accessed through STARTUPE2
Subsignal("cs_n", Pins("T19")), Subsignal("cs_n", Pins("T19")),
Subsignal("dq", Pins("P22", "R22", "P21", "R21")), Subsignal("dq", Pins("P22", "R22", "P21", "R21")),
IOStandard("LVCMOS33") IOStandard("LVCMOS33")
), ),
# tpm # TPM
("tpm", 0, ("tpm", 0,
Subsignal("clk", Pins("W20")), Subsignal("clk", Pins("W20")),
Subsignal("rst_n", Pins("V19")), Subsignal("rst_n", Pins("V19")),
...@@ -54,7 +53,7 @@ _io = [ ...@@ -54,7 +53,7 @@ _io = [
IOStandard("LVCMOS33"), IOStandard("LVCMOS33"),
), ),
# pcie # PCIe
("pcie_x1", 0, ("pcie_x1", 0,
Subsignal("rst_n", Pins("AB20"), IOStandard("LVCMOS33"), Misc("PULLUP=TRUE")), Subsignal("rst_n", Pins("AB20"), IOStandard("LVCMOS33"), Misc("PULLUP=TRUE")),
Subsignal("clk_p", Pins("F6")), Subsignal("clk_p", Pins("F6")),
...@@ -75,7 +74,7 @@ _io = [ ...@@ -75,7 +74,7 @@ _io = [
Subsignal("tx_n", Pins("A4 C5 A6 C7")) Subsignal("tx_n", Pins("A4 C5 A6 C7"))
), ),
# dram # DDR3 SDRAM
("ddram", 0, ("ddram", 0,
Subsignal("a", Pins( Subsignal("a", Pins(
"U6 T5 Y6 T6 V2 T4 Y2 R2", "U6 T5 Y6 T6 V2 T4 Y2 R2",
......
...@@ -14,7 +14,7 @@ from litex.build.xilinx import XilinxPlatform, VivadoProgrammer ...@@ -14,7 +14,7 @@ from litex.build.xilinx import XilinxPlatform, VivadoProgrammer
# IOs (initially auto-generated by extract_xdc_pins.py) --------------------------------------------- # IOs (initially auto-generated by extract_xdc_pins.py) ---------------------------------------------
_io = [ _io = [
# clk / rst # Clk / Rst
("clk300", 0, ("clk300", 0,
Subsignal("n", Pins("AY38"), IOStandard("DIFF_SSTL12")), Subsignal("n", Pins("AY38"), IOStandard("DIFF_SSTL12")),
Subsignal("p", Pins("AY37"), IOStandard("DIFF_SSTL12")), Subsignal("p", Pins("AY37"), IOStandard("DIFF_SSTL12")),
...@@ -33,24 +33,25 @@ _io = [ ...@@ -33,24 +33,25 @@ _io = [
), ),
("cpu_reset", 0, Pins("AL20"), IOStandard("LVCMOS12")), ("cpu_reset", 0, Pins("AL20"), IOStandard("LVCMOS12")),
# led # Leds
("user_led", 0, Pins("BC21"), IOStandard("LVCMOS12")), ("user_led", 0, Pins("BC21"), IOStandard("LVCMOS12")),
("user_led", 1, Pins("BB21"), IOStandard("LVCMOS12")), ("user_led", 1, Pins("BB21"), IOStandard("LVCMOS12")),
("user_led", 2, Pins("BA20"), IOStandard("LVCMOS12")), ("user_led", 2, Pins("BA20"), IOStandard("LVCMOS12")),
# switches # Switches
("set_sw", 0, Pins("AL21")), ("set_sw", 0, Pins("AL21")),
("user_sw", 0, Pins("AN22"), IOStandard("LVCMOS12")), ("user_sw", 0, Pins("AN22"), IOStandard("LVCMOS12")),
("user_sw", 1, Pins("AM19"), IOStandard("LVCMOS12")), ("user_sw", 1, Pins("AM19"), IOStandard("LVCMOS12")),
("user_sw", 2, Pins("AL19"), IOStandard("LVCMOS12")), ("user_sw", 2, Pins("AL19"), IOStandard("LVCMOS12")),
("user_sw", 3, Pins("AP20"), IOStandard("LVCMOS12")), ("user_sw", 3, Pins("AP20"), IOStandard("LVCMOS12")),
# gpio # GPIOs
("gpio_msp", 0, Pins("AR20"), IOStandard("LVCMOS12")), ("gpio_msp", 0, Pins("AR20"), IOStandard("LVCMOS12")),
("gpio_msp", 1, Pins("AM20"), IOStandard("LVCMOS12")), ("gpio_msp", 1, Pins("AM20"), IOStandard("LVCMOS12")),
("gpio_msp", 2, Pins("AM21"), IOStandard("LVCMOS12")), ("gpio_msp", 2, Pins("AM21"), IOStandard("LVCMOS12")),
("gpio_msp", 3, Pins("AN21"), IOStandard("LVCMOS12")), ("gpio_msp", 3, Pins("AN21"), IOStandard("LVCMOS12")),
# Serial
("serial", 0, ("serial", 0,
Subsignal("rx", Pins("BF18"), IOStandard("LVCMOS12")), Subsignal("rx", Pins("BF18"), IOStandard("LVCMOS12")),
Subsignal("tx", Pins("BB20"), IOStandard("LVCMOS12")), Subsignal("tx", Pins("BB20"), IOStandard("LVCMOS12")),
...@@ -60,7 +61,7 @@ _io = [ ...@@ -60,7 +61,7 @@ _io = [
Subsignal("tx", Pins("BB19"), IOStandard("LVCMOS12")), Subsignal("tx", Pins("BB19"), IOStandard("LVCMOS12")),
), ),
# ddram # DDR4 SDRAM
("ddram_reset_gate", 0, Pins("AU21"), IOStandard("LVCMOS12")), ("ddram_reset_gate", 0, Pins("AU21"), IOStandard("LVCMOS12")),
("ddram", 0, ("ddram", 0,
Subsignal("a", Pins( Subsignal("a", Pins(
...@@ -235,14 +236,14 @@ _io = [ ...@@ -235,14 +236,14 @@ _io = [
Misc("SLEW=FAST") Misc("SLEW=FAST")
), ),
# i2c # I2C
("i2c_rst_n", 0, Pins("BF19"), IOStandard("LVCMOS12")), ("i2c_rst_n", 0, Pins("BF19"), IOStandard("LVCMOS12")),
("i2c", 0, ("i2c", 0,
Subsignal("scl", Pins("BF20"), IOStandard("LVCMOS12")), Subsignal("scl", Pins("BF20"), IOStandard("LVCMOS12")),
Subsignal("sda", Pins("BF17"), IOStandard("LVCMOS12")), Subsignal("sda", Pins("BF17"), IOStandard("LVCMOS12")),
), ),
# si570 # SI570 Clock
("user_si570_clock", 0, ("user_si570_clock", 0,
Subsignal("n", Pins("AV19"), IOStandard("DIFF_SSTL12")), Subsignal("n", Pins("AV19"), IOStandard("DIFF_SSTL12")),
Subsignal("p", Pins("AU19"), IOStandard("DIFF_SSTL12")), Subsignal("p", Pins("AU19"), IOStandard("DIFF_SSTL12")),
...@@ -256,7 +257,7 @@ _io = [ ...@@ -256,7 +257,7 @@ _io = [
Subsignal("p", Pins("T11")), Subsignal("p", Pins("T11")),
), ),
# pcie # PCIe
("pcie_x16", 0, ("pcie_x16", 0,
Subsignal("rst_n", Pins("BD21"), IOStandard("LVCMOS12")), Subsignal("rst_n", Pins("BD21"), IOStandard("LVCMOS12")),
Subsignal("clk_n", Pins("AM10")), Subsignal("clk_n", Pins("AM10")),
...@@ -275,7 +276,7 @@ _io = [ ...@@ -275,7 +276,7 @@ _io = [
"AP7 AR9 AT7 AU9 AV7 BB5 BD5 BF5")), "AP7 AR9 AT7 AU9 AV7 BB5 BD5 BF5")),
), ),
# pcie # PCIe
("pcie_x4", 0, ("pcie_x4", 0,
Subsignal("rst_n", Pins("BD21"), IOStandard("LVCMOS12")), Subsignal("rst_n", Pins("BD21"), IOStandard("LVCMOS12")),
Subsignal("clk_n", Pins("AM10")), Subsignal("clk_n", Pins("AM10")),
...@@ -286,7 +287,7 @@ _io = [ ...@@ -286,7 +287,7 @@ _io = [
Subsignal("tx_p", Pins("AF7 AG9 AH7 AJ9")), Subsignal("tx_p", Pins("AF7 AG9 AH7 AJ9")),
), ),
# qsfp28 # QSFP28
("qsfp28", 0, ("qsfp28", 0,
Subsignal("clk_n", Pins("K10")), Subsignal("clk_n", Pins("K10")),
Subsignal("clk_p", Pins("K11")), Subsignal("clk_p", Pins("K11")),
...@@ -321,6 +322,8 @@ _io = [ ...@@ -321,6 +322,8 @@ _io = [
), ),
] ]
# Connectors ---------------------------------------------------------------------------------------
_connectors = [] _connectors = []
# Platform ----------------------------------------------------------------------------------------- # Platform -----------------------------------------------------------------------------------------
......
...@@ -12,6 +12,12 @@ from litex.build.openocd import OpenOCD ...@@ -12,6 +12,12 @@ from litex.build.openocd import OpenOCD
# IOs ---------------------------------------------------------------------------------------------- # IOs ----------------------------------------------------------------------------------------------
_io = [ _io = [
# Clk / Rst
("clk100", 0, Pins("E3"), IOStandard("LVCMOS33")),
("cpu_reset", 0, Pins("C2"), IOStandard("LVCMOS33")),
# Leds
("user_led", 0, Pins("H5"), IOStandard("LVCMOS33")), ("user_led", 0, Pins("H5"), IOStandard("LVCMOS33")),
("user_led", 1, Pins("J5"), IOStandard("LVCMOS33")), ("user_led", 1, Pins("J5"), IOStandard("LVCMOS33")),
("user_led", 2, Pins("T9"), IOStandard("LVCMOS33")), ("user_led", 2, Pins("T9"), IOStandard("LVCMOS33")),
...@@ -23,21 +29,18 @@ _io = [ ...@@ -23,21 +29,18 @@ _io = [
Subsignal("b", Pins("E1")), Subsignal("b", Pins("E1")),
IOStandard("LVCMOS33"), IOStandard("LVCMOS33"),
), ),
("rgb_led", 1, ("rgb_led", 1,
Subsignal("r", Pins("G3")), Subsignal("r", Pins("G3")),
Subsignal("g", Pins("J4")), Subsignal("g", Pins("J4")),
Subsignal("b", Pins("G4")), Subsignal("b", Pins("G4")),
IOStandard("LVCMOS33"), IOStandard("LVCMOS33"),
), ),
("rgb_led", 2, ("rgb_led", 2,
Subsignal("r", Pins("J3")), Subsignal("r", Pins("J3")),
Subsignal("g", Pins("J2")), Subsignal("g", Pins("J2")),
Subsignal("b", Pins("H4")), Subsignal("b", Pins("H4")),
IOStandard("LVCMOS33"), IOStandard("LVCMOS33"),
), ),
("rgb_led", 3, ("rgb_led", 3,
Subsignal("r", Pins("K1")), Subsignal("r", Pins("K1")),
Subsignal("g", Pins("H6")), Subsignal("g", Pins("H6")),
...@@ -45,26 +48,26 @@ _io = [ ...@@ -45,26 +48,26 @@ _io = [
IOStandard("LVCMOS33"), IOStandard("LVCMOS33"),
), ),
# Switches
("user_sw", 0, Pins("A8"), IOStandard("LVCMOS33")), ("user_sw", 0, Pins("A8"), IOStandard("LVCMOS33")),
("user_sw", 1, Pins("C11"), IOStandard("LVCMOS33")), ("user_sw", 1, Pins("C11"), IOStandard("LVCMOS33")),
("user_sw", 2, Pins("C10"), IOStandard("LVCMOS33")), ("user_sw", 2, Pins("C10"), IOStandard("LVCMOS33")),
("user_sw", 3, Pins("A10"), IOStandard("LVCMOS33")), ("user_sw", 3, Pins("A10"), IOStandard("LVCMOS33")),
# Buttons
("user_btn", 0, Pins("D9"), IOStandard("LVCMOS33")), ("user_btn", 0, Pins("D9"), IOStandard("LVCMOS33")),
("user_btn", 1, Pins("C9"), IOStandard("LVCMOS33")), ("user_btn", 1, Pins("C9"), IOStandard("LVCMOS33")),
("user_btn", 2, Pins("B9"), IOStandard("LVCMOS33")), ("user_btn", 2, Pins("B9"), IOStandard("LVCMOS33")),
("user_btn", 3, Pins("B8"), IOStandard("LVCMOS33")), ("user_btn", 3, Pins("B8"), IOStandard("LVCMOS33")),
("clk100", 0, Pins("E3"), IOStandard("LVCMOS33")), # Serial
("cpu_reset", 0, Pins("C2"), IOStandard("LVCMOS33")),
("serial", 0, ("serial", 0,
Subsignal("tx", Pins("D10")), Subsignal("tx", Pins("D10")),
Subsignal("rx", Pins("A9")), Subsignal("rx", Pins("A9")),
IOStandard("LVCMOS33") IOStandard("LVCMOS33")
), ),
# SPI
("spi", 0, ("spi", 0,
Subsignal("clk", Pins("F1")), Subsignal("clk", Pins("F1")),
Subsignal("cs_n", Pins("C1")), Subsignal("cs_n", Pins("C1")),
...@@ -73,6 +76,7 @@ _io = [ ...@@ -73,6 +76,7 @@ _io = [
IOStandard("LVCMOS33"), IOStandard("LVCMOS33"),
), ),
# I2C
("i2c", 0, ("i2c", 0,
Subsignal("scl", Pins("L18")), Subsignal("scl", Pins("L18")),
Subsignal("sda", Pins("M18")), Subsignal("sda", Pins("M18")),
...@@ -81,12 +85,7 @@ _io = [ ...@@ -81,12 +85,7 @@ _io = [
IOStandard("LVCMOS33"), IOStandard("LVCMOS33"),
), ),
("spiflash4x", 0, # SPIFlash
Subsignal("cs_n", Pins("L13")),
Subsignal("clk", Pins("L16")),
Subsignal("dq", Pins("K17", "K18", "L14", "M14")),
IOStandard("LVCMOS33")
),
("spiflash", 0, ("spiflash", 0,
Subsignal("cs_n", Pins("L13")), Subsignal("cs_n", Pins("L13")),
Subsignal("clk", Pins("L16")), Subsignal("clk", Pins("L16")),
...@@ -96,7 +95,14 @@ _io = [ ...@@ -96,7 +95,14 @@ _io = [
Subsignal("hold", Pins("M14")), Subsignal("hold", Pins("M14")),
IOStandard("LVCMOS33"), IOStandard("LVCMOS33"),
), ),
("spiflash4x", 0,
Subsignal("cs_n", Pins("L13")),
Subsignal("clk", Pins("L16")),
Subsignal("dq", Pins("K17", "K18", "L14", "M14")),
IOStandard("LVCMOS33")
),
# DDR3 SDRAM
("ddram", 0, ("ddram", 0,
Subsignal("a", Pins( Subsignal("a", Pins(
"R2 M6 N4 T1 N6 R7 V6 U7", "R2 M6 N4 T1 N6 R7 V6 U7",
...@@ -127,6 +133,7 @@ _io = [ ...@@ -127,6 +133,7 @@ _io = [
Misc("SLEW=FAST"), Misc("SLEW=FAST"),
), ),
# MII Ethernet
("eth_ref_clk", 0, Pins("G18"), IOStandard("LVCMOS33")), ("eth_ref_clk", 0, Pins("G18"), IOStandard("LVCMOS33")),
("eth_clocks", 0, ("eth_clocks", 0,
Subsignal("tx", Pins("H16")), Subsignal("tx", Pins("H16")),
......
...@@ -12,6 +12,11 @@ from litex.build.openocd import OpenOCD ...@@ -12,6 +12,11 @@ from litex.build.openocd import OpenOCD
# IOs ---------------------------------------------------------------------------------------------- # IOs ----------------------------------------------------------------------------------------------
_io = [ _io = [
# Clk / Rst
("clk100", 0, Pins("R2"), IOStandard("SSTL135")),
("cpu_reset", 0, Pins("C18"), IOStandard("LVCMOS33")),
# Leds
("user_led", 0, Pins("E18"), IOStandard("LVCMOS33")), ("user_led", 0, Pins("E18"), IOStandard("LVCMOS33")),
("user_led", 1, Pins("F13"), IOStandard("LVCMOS33")), ("user_led", 1, Pins("F13"), IOStandard("LVCMOS33")),
("user_led", 2, Pins("E13"), IOStandard("LVCMOS33")), ("user_led", 2, Pins("E13"), IOStandard("LVCMOS33")),
...@@ -23,7 +28,6 @@ _io = [ ...@@ -23,7 +28,6 @@ _io = [
Subsignal("b", Pins("F15")), Subsignal("b", Pins("F15")),
IOStandard("LVCMOS33") IOStandard("LVCMOS33")
), ),
("rgb_led", 1, ("rgb_led", 1,
Subsignal("r", Pins("E15")), Subsignal("r", Pins("E15")),
Subsignal("g", Pins("F18")), Subsignal("g", Pins("F18")),
...@@ -31,6 +35,7 @@ _io = [ ...@@ -31,6 +35,7 @@ _io = [
IOStandard("LVCMOS33") IOStandard("LVCMOS33")
), ),
# Switches
("user_sw", 0, Pins("H14"), IOStandard("LVCMOS33")), ("user_sw", 0, Pins("H14"), IOStandard("LVCMOS33")),
("user_sw", 1, Pins("H18"), IOStandard("LVCMOS33")), ("user_sw", 1, Pins("H18"), IOStandard("LVCMOS33")),
("user_sw", 2, Pins("G18"), IOStandard("LVCMOS33")), ("user_sw", 2, Pins("G18"), IOStandard("LVCMOS33")),
...@@ -41,15 +46,14 @@ _io = [ ...@@ -41,15 +46,14 @@ _io = [
("user_btn", 2, Pins("J16"), IOStandard("LVCMOS33")), ("user_btn", 2, Pins("J16"), IOStandard("LVCMOS33")),
("user_btn", 3, Pins("H13"), IOStandard("LVCMOS33")), ("user_btn", 3, Pins("H13"), IOStandard("LVCMOS33")),
("clk100", 0, Pins("R2"), IOStandard("SSTL135")), # Serial
("cpu_reset", 0, Pins("C18"), IOStandard("LVCMOS33")),
("serial", 0, ("serial", 0,
Subsignal("tx", Pins("R12")), Subsignal("tx", Pins("R12")),
Subsignal("rx", Pins("V12")), Subsignal("rx", Pins("V12")),
IOStandard("LVCMOS33")), IOStandard("LVCMOS33")
),
# SPI
("spi", 0, ("spi", 0,
Subsignal("clk", Pins("G16")), Subsignal("clk", Pins("G16")),
Subsignal("cs_n", Pins("H16")), Subsignal("cs_n", Pins("H16")),
...@@ -58,18 +62,14 @@ _io = [ ...@@ -58,18 +62,14 @@ _io = [
IOStandard("LVCMOS33") IOStandard("LVCMOS33")
), ),
# I2C
("i2c", 0, ("i2c", 0,
Subsignal("scl", Pins("J14")), Subsignal("scl", Pins("J14")),
Subsignal("sda", Pins("J13")), Subsignal("sda", Pins("J1