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: 125432b5b69e
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: c615b50735ab
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 25, 2015

  1. Copy the full SHA
    ffb6081 View commit details
  2. Copy the full SHA
    52e6bf6 View commit details
  3. Merge pull request #14 from olofk/misc_fixes

    Misc fixes
    enjoy-digital committed Jun 25, 2015
    Copy the full SHA
    c615b50 View commit details
Showing with 7 additions and 5 deletions.
  1. +1 −1 misoclib/mem/litesata/example_designs/targets/core.py
  2. +6 −4 misoclib/mem/litesata/test/Makefile
2 changes: 1 addition & 1 deletion misoclib/mem/litesata/example_designs/targets/core.py
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ def __init__(self, platform, clk_freq=166*1000000, with_bist=True, nports=4):
self.clk_freq = clk_freq

# SATA PHY/Core/Frontend
self.submodules.sata_phy = LiteSATAPHY(platform.device, platform.request("sata"), "sata_gen2", clk_freq)
self.submodules.sata_phy = LiteSATAPHY(platform.device, platform.request("sys_clk"), platform.request("sata"), "sata_gen2", clk_freq)
self.submodules.sata_core = LiteSATACore(self.sata_phy)
self.submodules.sata_crossbar = LiteSATACrossbar(self.sata_core)

10 changes: 6 additions & 4 deletions misoclib/mem/litesata/test/Makefile
Original file line number Diff line number Diff line change
@@ -13,8 +13,7 @@ crc_tb:
$(CC) $(CFLAGS) $(INC) -o crc crc.c
$(CMD) crc_tb.py

scrambler_tb:
$(CC) $(CFLAGS) $(INC) -o scrambler scrambler.c
scrambler_tb: scrambler
$(CMD) scrambler_tb.py

cont_tb:
@@ -26,7 +25,7 @@ link_tb:
command_tb:
$(CMD) command_tb.py

bist_tb:
bist_tb: scrambler
$(CMD) bist_tb.py

striping_tb:
@@ -35,5 +34,8 @@ striping_tb:
mirroring_tb:
$(CMD) mirroring_tb.py

scrambler: scrambler.c
$(CC) $(CFLAGS) $(INC) -o $@ $<

clean:
rm crc scrambler *.vcd
rm -f crc scrambler *.vcd