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: 66f8dcbfaf9d
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: 8b41ab3a5ffc
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 6, 2015

  1. Copy the full SHA
    176b924 View commit details
  2. Copy the full SHA
    8b41ab3 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 make.py
  2. +1 −1 misoclib/soc/sdram.py
2 changes: 1 addition & 1 deletion make.py
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ def _get_args():
if args.external:
platform.soc_ext_path = os.path.abspath(args.external)

build_name = top_class.__name__.lower() + "-" + platform_name
build_name = args.target + "-" + top_class.__name__.lower() + "-" + platform_name
top_kwargs = dict((k, autotype(v)) for k, v in args.target_option)
soc = top_class(platform, **top_kwargs)
soc.finalize()
2 changes: 1 addition & 1 deletion misoclib/soc/sdram.py
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ def register_sdram_phy(self, phy):
from mibuild.xilinx.vivado import XilinxVivadoToolchain
if isinstance(self.platform.toolchain, XilinxVivadoToolchain):
from migen.fhdl.simplify import FullMemoryWE
self.submodules.wishbone2lasmi = FullMemoryWE(wishbone2lasmi.WB2LASMI(l2_size//4, self.sdram.crossbar.get_master()))
self.submodules.wishbone2lasmi = FullMemoryWE()(wishbone2lasmi.WB2LASMI(l2_size//4, self.sdram.crossbar.get_master()))
else:
self.submodules.wishbone2lasmi = wishbone2lasmi.WB2LASMI(l2_size//4, self.sdram.crossbar.get_master())
self.register_mem("main_ram", self.mem_map["main_ram"], self.wishbone2lasmi.wishbone, main_ram_size)