From a3759b11930f234c6cdb7d0dc0b739640e974131 Mon Sep 17 00:00:00 2001 From: whitequark Date: Fri, 5 Jul 2019 20:15:49 +0000 Subject: [PATCH] =?utf8?q?dev.flash:=20spiflash=E2=86=92spi=5Fflash,=20spi?= =?utf8?q?flash{2x,4x}=E2=86=92spi=5Fflash=5F{2x,4x}.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Every other resource name uses underscores for separation, like eth_rgmii, so SPI flash should do it too. --- nmigen_boards/dev/flash.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nmigen_boards/dev/flash.py b/nmigen_boards/dev/flash.py index 0311789..747d239 100644 --- a/nmigen_boards/dev/flash.py +++ b/nmigen_boards/dev/flash.py @@ -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 -- 2.30.2