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: dd944bccf5c9
Choose a base ref
...
head repository: GlasgowEmbedded/glasgow
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4cabca17a5ad
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 12, 2019

  1. cli: fix --rev argument validation.

    @whitequark
    whitequark committed Mar 12, 2019
    Copy the full SHA
    b483d47 View commit details

  2. access.direct.multiplexer: inject pin location into bitstream ID. 

    Fixes #103.
    @whitequark
    whitequark committed Mar 12, 2019
    Copy the full SHA
    4cabca1 View commit details
Showing with 7 additions and 2 deletions.
  1. +5 −0 software/glasgow/access/direct/multiplexer.py
  2. +2 −2 software/glasgow/cli.py
5 changes: 5 additions & 0 deletions software/glasgow/access/direct/multiplexer.py
View file
Original file line number Diff line number Diff line change
@@ -150,6 +150,7 @@ def get_pin_name(self, pin_num):
def build_pin_tristate(self, pin_num, oe, o, i):
port, bit, req = self._pins[pin_num]
pin_parts = req(bit)

self.specials += \
Instance("SB_IO",
p_PIN_TYPE=C(0b101001, 6), # PIN_OUTPUT_TRISTATE|PIN_INPUT
@@ -161,6 +162,10 @@ def build_pin_tristate(self, pin_num, oe, o, i):
if hasattr(pin_parts, "oe"):
self.comb += pin_parts.oe.eq(oe)

# This makes the bitstream ID depend on physical pin location, as .pcf is currently
# not taken into account when generating bitstream ID.
pin_parts.io.attr.add(("glasgow.pin", "{}{}".format(port, bit)))

def _throttle_fifo(self, fifo):
self.submodules += fifo
if self._throttle == "full":
4 changes: 2 additions & 2 deletions software/glasgow/cli.py
View file
Original file line number Diff line number Diff line change
@@ -234,10 +234,10 @@ def add_toolchain_args(parser):
add_applet_arg(g_flash_bitstream, mode="build")

def revision(arg):
if re.match(r"^A0|B0|C0$", string):
if re.match(r"^A0|B0|C0$", arg):
return arg
else:
raise argparse.ArgumentTypeError("{} is not a valid revision letter".format(arg))
raise argparse.ArgumentTypeError("{} is not a valid revision".format(arg))

def serial(arg):
if re.match(r"^\d{8}T\d{6}Z$", arg):