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/nmigen-boards
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: eda058f3e986
Choose a base ref
...
head repository: m-labs/nmigen-boards
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a3759b11930f
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jul 5, 2019

  1. dev.flash: spiflash→spi_flash, spiflash{2x,4x}→spi_flash_{2x,4x}.

    Every other resource name uses underscores for separation, like
    eth_rgmii, so SPI flash should do it too.
    whitequark committed Jul 5, 2019
    Copy the full SHA
    a3759b1 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 nmigen_boards/dev/flash.py
6 changes: 3 additions & 3 deletions nmigen_boards/dev/flash.py
Original file line number Diff line number Diff line change
@@ -19,15 +19,15 @@ def SPIFlashResources(number, *, cs, clk, mosi, miso, wp=None, hold=None, attrs=
if wp is not None and hold is not None:
io_1x.append(Subsignal("wp", PinsN(wp, dir="o")))
io_1x.append(Subsignal("hold", PinsN(hold, dir="o")))
resources.append(Resource("spiflash", number, *io_1x))
resources.append(Resource("spi_flash", number, *io_1x))

io_2x = list(io_all)
io_2x.append(Subsignal("dq", Pins(" ".join([mosi, miso]), dir="io")))
resources.append(Resource("spiflash2x", number, *io_2x))
resources.append(Resource("spi_flash_2x", number, *io_2x))

if wp is not None and hold is not None:
io_4x = list(io_all)
io_4x.append(Subsignal("dq", Pins(" ".join([mosi, miso, wp, hold]), dir="io")))
resources.append(Resource("spiflash4x", number, *io_4x))
resources.append(Resource("spi_flash_4x", number, *io_4x))

return resources