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: bd7748299b95
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: 8e860e3aba73
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Sep 28, 2015

  1. Revert "Sort constants in csr generation." 

    This reverts commit d628c14.
    @sbourdeauducq
    sbourdeauducq committed Sep 28, 2015
    Copy the full SHA
    75d927e View commit details

  2. Merge branch 'master' of github.com:m-labs/misoc

    @sbourdeauducq
    sbourdeauducq committed Sep 28, 2015
    Copy the full SHA
    8e860e3 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 make.py
2 changes: 1 addition & 1 deletion make.py
View file
Original file line number Diff line number Diff line change
@@ -167,7 +167,7 @@ def _get_args():
write_to_file(os.path.join(genhdir, "sdram_phy.h"), boilerplate + sdram_phy_header)
mem_header = cpuif.get_mem_header(memory_regions, getattr(soc, "flash_boot_address", None))
write_to_file(os.path.join(genhdir, "mem.h"), boilerplate + mem_header)
csr_header = cpuif.get_csr_header(csr_regions, sorted(soc.get_constants()))
csr_header = cpuif.get_csr_header(csr_regions, soc.get_constants())
write_to_file(os.path.join(genhdir, "csr.h"), boilerplate + csr_header)

if actions["build-csr-csv"]: