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

Commits on Apr 1, 2019

  1. glasgow.platform.{rev_c→rev_c0}

    @whitequark
    whitequark committed Apr 1, 2019
    Copy the full SHA
    b12f7a9 View commit details
Showing with 7 additions and 7 deletions.
  1. +2 −2 software/glasgow/platform/__init__.py
  2. +2 −2 software/glasgow/platform/{rev_c.py → rev_c0.py}
  3. +3 −3 software/glasgow/target/hardware.py
4 changes: 2 additions & 2 deletions software/glasgow/platform/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
from .rev_ab import GlasgowPlatformRevAB
from .rev_c import GlasgowPlatformRevC
from .rev_ab import *
from .rev_c0 import *
4 changes: 2 additions & 2 deletions software/glasgow/platform/rev_c.py → software/glasgow/platform/rev_c0.py
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
from .programmer import GlasgowProgrammer


__all__ = ["GlasgowPlatformRevC"]
__all__ = ["GlasgowPlatformRevC0"]


_io = [
@@ -61,7 +61,7 @@
]


class GlasgowPlatformRevC(LatticePlatform):
class GlasgowPlatformRevC0(LatticePlatform):
default_clk_name = "clk_if"
default_clk_period = 1e9 / 30e6

6 changes: 3 additions & 3 deletions software/glasgow/target/hardware.py
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
from ..gateware.registers import I2CRegisters
from ..gateware.fx2 import FX2Arbiter
from ..gateware.platform.lattice import special_overrides
from ..platform import GlasgowPlatformRevAB, GlasgowPlatformRevC
from ..platform import GlasgowPlatformRevAB, GlasgowPlatformRevC0
from .analyzer import GlasgowAnalyzer


@@ -52,8 +52,8 @@ class GlasgowHardwareTarget(Module):
def __init__(self, revision, multiplexer_cls=None, with_analyzer=False):
if revision in ("A0", "B0"):
self.platform = GlasgowPlatformRevAB()
elif revision in ("C0",):
self.platform = GlasgowPlatformRevC()
elif revision == "C0":
self.platform = GlasgowPlatformRevC0()
else:
raise ValueError("Unknown revision")