Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: GlasgowEmbedded/glasgow
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b199300622ab
Choose a base ref
...
head repository: GlasgowEmbedded/glasgow
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8c4d6247b3c8
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jun 3, 2020

  1. platform.rev_c[01]: add pullups on IO pins.

    @whitequark
    whitequark committed Jun 3, 2020
    Copy the full SHA
    8c4d624 View commit details
Showing with 107 additions and 46 deletions.
  1. +53 −23 software/glasgow/platform/rev_c0.py
  2. +54 −23 software/glasgow/platform/rev_c1.py
76 changes: 53 additions & 23 deletions software/glasgow/platform/rev_c0.py
View file
Original file line number Diff line number Diff line change
@@ -41,52 +41,82 @@ class GlasgowPlatformRevC0(GlasgowPlatformICE40):
Resource("led", 3, Pins("D9", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("led", 4, Pins("E8", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS33")),

Resource("port_a", 0, Subsignal("io", Pins("A1")), Subsignal("oe", Pins("C7", dir="o")),
Resource("port_a", 0,
Subsignal("io", Pins("A1"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("C7", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_a", 1, Subsignal("io", Pins("A2")), Subsignal("oe", Pins("C8", dir="o")),
Resource("port_a", 1,
Subsignal("io", Pins("A2"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("C8", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_a", 2, Subsignal("io", Pins("B3")), Subsignal("oe", Pins("D7", dir="o")),
Resource("port_a", 2,
Subsignal("io", Pins("B3"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("D7", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_a", 3, Subsignal("io", Pins("A3")), Subsignal("oe", Pins("A7", dir="o")),
Resource("port_a", 3,
Subsignal("io", Pins("A3"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("A7", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_a", 4, Subsignal("io", Pins("B6")), Subsignal("oe", Pins("B8", dir="o")),
Resource("port_a", 4,
Subsignal("io", Pins("B6"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("B8", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_a", 5, Subsignal("io", Pins("A4")), Subsignal("oe", Pins("A8", dir="o")),
Resource("port_a", 5,
Subsignal("io", Pins("A4"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("A8", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_a", 6, Subsignal("io", Pins("B7")), Subsignal("oe", Pins("B9", dir="o")),
Resource("port_a", 6,
Subsignal("io", Pins("B7"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("B9", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_a", 7, Subsignal("io", Pins("A5")), Subsignal("oe", Pins("A9", dir="o")),
Resource("port_a", 7,
Subsignal("io", Pins("A5"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("A9", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),

Resource("port_b", 0, Subsignal("io", Pins("B11")), Subsignal("oe", Pins("F9", dir="o")),
Resource("port_b", 0,
Subsignal("io", Pins("B11"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("F9", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_b", 1, Subsignal("io", Pins("C11")), Subsignal("oe", Pins("G11", dir="o")),
Resource("port_b", 1,
Subsignal("io", Pins("C11"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("G11", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_b", 2, Subsignal("io", Pins("D10")), Subsignal("oe", Pins("G10", dir="o")),
Resource("port_b", 2,
Subsignal("io", Pins("D10"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("G10", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_b", 3, Subsignal("io", Pins("D11")), Subsignal("oe", Pins("H11", dir="o")),
Resource("port_b", 3,
Subsignal("io", Pins("D11"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("H11", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_b", 4, Subsignal("io", Pins("E10")), Subsignal("oe", Pins("H10", dir="o")),
Resource("port_b", 4,
Subsignal("io", Pins("E10"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("H10", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_b", 5, Subsignal("io", Pins("E11")), Subsignal("oe", Pins("J11", dir="o")),
Resource("port_b", 5,
Subsignal("io", Pins("E11"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("J11", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_b", 6, Subsignal("io", Pins("F11")), Subsignal("oe", Pins("J10", dir="o")),
Resource("port_b", 6,
Subsignal("io", Pins("F11"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("J10", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_b", 7, Subsignal("io", Pins("F10")), Subsignal("oe", Pins("K11", dir="o")),
Resource("port_b", 7,
Subsignal("io", Pins("F10"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("K11", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),

Resource("port_s", 0, Subsignal("io", Pins("A11")),
Resource("port_s", 0,
Subsignal("io", Pins("A11")),
Attrs(IO_STANDARD="SB_LVCMOS33")),

Resource("aux", 0, Pins("A10"),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("aux", 1, Pins("C9"),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("aux", 0, Pins("A10"), Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("aux", 1, Pins("C9"), Attrs(IO_STANDARD="SB_LVCMOS33")),

# On revC, these balls are shared with B6 and B7, respectively.
# Since the default pin state is a weak pullup, we need to tristate them explicitly.
Resource("unused", 0, Pins("A6 B5", dir="oe"),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("unused", 0, Pins("A6 B5", dir="oe"), Attrs(IO_STANDARD="SB_LVCMOS33")),
]
connectors = [
]
77 changes: 54 additions & 23 deletions software/glasgow/platform/rev_c1.py
View file
Original file line number Diff line number Diff line change
@@ -41,52 +41,83 @@ class GlasgowPlatformRevC1(GlasgowPlatformICE40):
Resource("led", 3, Pins("D9", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("led", 4, Pins("E8", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS33")),

Resource("port_a", 0, Subsignal("io", Pins("A1")), Subsignal("oe", Pins("C7", dir="o")),
Resource("port_a", 0,
Subsignal("io", Pins("A1"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("C7", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_a", 1, Subsignal("io", Pins("A2")), Subsignal("oe", Pins("C8", dir="o")),
Resource("port_a", 1,
Subsignal("io", Pins("A2"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("C8", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_a", 2, Subsignal("io", Pins("B3")), Subsignal("oe", Pins("D7", dir="o")),
Resource("port_a", 2,
Subsignal("io", Pins("B3"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("D7", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_a", 3, Subsignal("io", Pins("A3")), Subsignal("oe", Pins("A7", dir="o")),
Resource("port_a", 3,
Subsignal("io", Pins("A3"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("A7", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_a", 4, Subsignal("io", Pins("B6")), Subsignal("oe", Pins("B8", dir="o")),
Resource("port_a", 4,
Subsignal("io", Pins("B6"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("B8", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_a", 5, Subsignal("io", Pins("A4")), Subsignal("oe", Pins("A8", dir="o")),
Resource("port_a", 5,
Subsignal("io", Pins("A4"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("A8", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_a", 6, Subsignal("io", Pins("B7")), Subsignal("oe", Pins("B9", dir="o")),
Resource("port_a", 6,
Subsignal("io", Pins("B7"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("B9", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_a", 7, Subsignal("io", Pins("A5")), Subsignal("oe", Pins("A9", dir="o")),
Resource("port_a", 7,
Subsignal("io", Pins("A5"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("A9", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),

Resource("port_b", 0, Subsignal("io", Pins("B11")), Subsignal("oe", Pins("F9", dir="o")),
Resource("port_b", 0,
Subsignal("io", Pins("B11"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("F9", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_b", 1, Subsignal("io", Pins("C11")), Subsignal("oe", Pins("G11", dir="o")),
Resource("port_b", 1,
Subsignal("io", Pins("C11"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("G11", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_b", 2, Subsignal("io", Pins("D10")), Subsignal("oe", Pins("G10", dir="o")),
Resource("port_b", 2,
Subsignal("io", Pins("D10"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("G10", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_b", 3, Subsignal("io", Pins("D11")), Subsignal("oe", Pins("H11", dir="o")),
Resource("port_b", 3,
Subsignal("io", Pins("D11"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("H11", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_b", 4, Subsignal("io", Pins("E10")), Subsignal("oe", Pins("H10", dir="o")),
Resource("port_b", 4,
Subsignal("io", Pins("E10"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("H10", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_b", 5, Subsignal("io", Pins("E11")), Subsignal("oe", Pins("J11", dir="o")),
Resource("port_b", 5,
Subsignal("io", Pins("E11"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("J11", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_b", 6, Subsignal("io", Pins("F11")), Subsignal("oe", Pins("J10", dir="o")),
Resource("port_b", 6,
Subsignal("io", Pins("F11"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("J10", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("port_b", 7, Subsignal("io", Pins("F10")), Subsignal("oe", Pins("K11", dir="o")),
Resource("port_b", 7,
Subsignal("io", Pins("F10"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("K11", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),

Resource("port_s", 0, Subsignal("io", Pins("A11")), Subsignal("oe", Pins("B4", dir="o")),
Resource("port_s", 0,
Subsignal("io", Pins("A11"), Attrs(PULLUP=1)),
Subsignal("oe", Pins("B4", dir="o")),
Attrs(IO_STANDARD="SB_LVCMOS33")),

Resource("aux", 0, Pins("A10"),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("aux", 1, Pins("C9"),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("aux", 0, Pins("A10"), Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("aux", 1, Pins("C9"), Attrs(IO_STANDARD="SB_LVCMOS33")),

# On revC, these balls are shared with B6 and B7, respectively.
# Since the default pin state is a weak pullup, we need to tristate them explicitly.
Resource("unused", 0, Pins("A6 B5", dir="oe"),
Attrs(IO_STANDARD="SB_LVCMOS33")),
Resource("unused", 0, Pins("A6 B5", dir="oe"), Attrs(IO_STANDARD="SB_LVCMOS33")),
]
connectors = [
]