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: m-labs/misoc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 72f9af9
Choose a base ref
...
head repository: m-labs/misoc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 204452b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Feb 16, 2012

  1. lm32: compatibility with the new instance API

    Sebastien Bourdeauducq committed Feb 16, 2012
    Copy the full SHA
    f36a45e View commit details
  2. m1crg: make clock feedback pin bidirectional

    Sebastien Bourdeauducq committed Feb 16, 2012
    Copy the full SHA
    204452b View commit details
Showing with 5 additions and 7 deletions.
  1. +2 −5 milkymist/lm32/__init__.py
  2. +3 −2 milkymist/m1crg/__init__.py
7 changes: 2 additions & 5 deletions milkymist/lm32/__init__.py
Original file line number Diff line number Diff line change
@@ -38,11 +38,8 @@ def __init__(self):
("D_ERR_I", d.err),
("D_RTY_I", BV(1))],

[],

"clk_i",
"rst_i",
"lm32")
clkport="clk_i",
rstport="rst_i")

def get_fragment(self):
comb = [
5 changes: 3 additions & 2 deletions milkymist/m1crg/__init__.py
Original file line number Diff line number Diff line change
@@ -37,8 +37,9 @@ def __init__(self, infreq, outfreq1x):
generated,
[
("clkin", self.clkin),
("trigger_reset", self.trigger_reset),
("rd_clk_lb", self.rd_clk_lb) # TODO: inout
("trigger_reset", self.trigger_reset)
], [
("rd_clk_lb", self.rd_clk_lb)
], [
("in_period", in_period),
("f_mult", ratio.numerator),