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: 7ee483699ec0
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: 99564af09e99
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Aug 21, 2017

  1. sayma_amc: fix spiflash

    @sbourdeauducq
    sbourdeauducq committed Aug 21, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    857ddcc View commit details

  2. sayma_amc: do not use integrated ROM by default

    @sbourdeauducq
    sbourdeauducq committed Aug 21, 2017
    Copy the full SHA
    99564af View commit details
Showing with 1 addition and 2 deletions.
  1. +1 −2 misoc/targets/sayma_amc.py
3 changes: 1 addition & 2 deletions misoc/targets/sayma_amc.py
View file
Original file line number Diff line number Diff line change
@@ -75,7 +75,6 @@ class BaseSoC(SoCSDRAM):
def __init__(self, sdram="ddram_64", sdram_controller_type="minicon", **kwargs):
platform = sayma_amc.Platform()
SoCSDRAM.__init__(self, platform, clk_freq=125*1000000,
integrated_rom_size=0x10000,
**kwargs)

self.submodules.crg = _CRG(platform)
@@ -95,7 +94,7 @@ def __init__(self, sdram="ddram_64", sdram_controller_type="minicon", **kwargs):
i_USRDONEO=1, i_USRDONETS=1,
i_USRCCLKO=spiflash_pads.clk, i_USRCCLKTS=0,
i_FCSBO=1, i_FCSBTS=0,
o_DI=di, i_DO=do, i_DTS=0b1110)
i_DO=0, i_DTS=0b1110)
self.submodules.spiflash = spi_flash.SpiFlash(spiflash_pads, dummy=11, div=2)
self.config["SPIFLASH_PAGE_SIZE"] = 256
self.config["SPIFLASH_SECTOR_SIZE"] = 0x10000