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: f7787c3c1332
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: 93a615ade411
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 14, 2015

  1. integration/builder: fix building for SoCSDRAM-based targets when SDR… 

    …AM is disabled

Reported by Florent Kermarrec
    @sbourdeauducq
    sbourdeauducq committed Oct 14, 2015
    Copy the full SHA
    ecc4c57 View commit details

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

    @sbourdeauducq
    sbourdeauducq committed Oct 14, 2015
    Copy the full SHA
    93a615a View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 misoc/integration/builder.py
2 changes: 1 addition & 1 deletion misoc/integration/builder.py
View file
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ def _generate_includes(self):
flash_boot_address = getattr(self.soc, "flash_boot_address", None)
csr_regions = self.soc.get_csr_regions()
constants = self.soc.get_constants()
if isinstance(self.soc, soc_sdram.SoCSDRAM):
if isinstance(self.soc, soc_sdram.SoCSDRAM) and self.soc._sdram_phy:
sdram_phy_settings = self.soc._sdram_phy[0].settings
else:
sdram_phy_settings = None