From 0f648ac4efbf65ee0ec72d51d52dcb0d365fb568 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Tue, 27 Jul 2021 16:50:18 +0200 Subject: [PATCH] 1bitsquared_icebreaker: Add test code to use LiteSPI. Both XiP from SPI(1X) or QSPI(4X) are working, but resource usage is currently too high to be able to switch to it by default. We'll first try to reduce it. Resource usage using SPI(1X) and actual LiteX SPI Flash core: Info: Device utilisation: Info: ICESTORM_LC: 2016/ 5280 38% Info: ICESTORM_RAM: 2/ 30 6% Info: SB_IO: 15/ 96 15% Info: SB_GB: 8/ 8 100% Info: ICESTORM_PLL: 1/ 1 100% Info: SB_WARMBOOT: 0/ 1 0% Info: ICESTORM_DSP: 0/ 8 0% Info: ICESTORM_HFOSC: 0/ 1 0% Info: ICESTORM_LFOSC: 0/ 1 0% Info: SB_I2C: 0/ 2 0% Info: SB_SPI: 0/ 2 0% Info: IO_I3C: 0/ 2 0% Info: SB_LEDDA_IP: 0/ 1 0% Info: SB_RGBA_DRV: 0/ 1 0% Info: ICESTORM_SPRAM: 4/ 4 100% Resource usage using LiteSPI: Info: Device utilisation: Info: ICESTORM_LC: 3964/ 5280 75% Info: ICESTORM_RAM: 2/ 30 6% Info: SB_IO: 15/ 96 15% Info: SB_GB: 8/ 8 100% Info: ICESTORM_PLL: 1/ 1 100% Info: SB_WARMBOOT: 0/ 1 0% Info: ICESTORM_DSP: 0/ 8 0% Info: ICESTORM_HFOSC: 0/ 1 0% Info: ICESTORM_LFOSC: 0/ 1 0% Info: SB_I2C: 0/ 2 0% Info: SB_SPI: 0/ 2 0% Info: IO_I3C: 0/ 2 0% Info: SB_LEDDA_IP: 0/ 1 0% Info: SB_RGBA_DRV: 0/ 1 0% Info: ICESTORM_SPRAM: 4/ 4 100% --- litex_boards/targets/1bitsquared_icebreaker.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/litex_boards/targets/1bitsquared_icebreaker.py b/litex_boards/targets/1bitsquared_icebreaker.py index 18cebf60..4bed916e 100755 --- a/litex_boards/targets/1bitsquared_icebreaker.py +++ b/litex_boards/targets/1bitsquared_icebreaker.py @@ -95,8 +95,20 @@ class BaseSoC(SoCCore): self.submodules.spram = Up5kSPRAM(size=128*kB) self.bus.add_slave("sram", self.spram.bus, SoCRegion(size=128*kB)) + # SPI Flash -------------------------------------------------------------------------------- - self.add_spi_flash(mode="1x", dummy_cycles=8) + use_litespi = False + if use_litespi: + from litespi.modules import W25Q128JV + from litespi.opcodes import SpiNorFlashOpCodes as Codes + from litespi.phy.generic import LiteSPIPHY + from litespi import LiteSPI + self.submodules.spiflash_phy = LiteSPIPHY(platform.request("spiflash4x"), W25Q128JV(Codes.READ_1_1_4)) + self.submodules.spiflash_mmap = LiteSPI(self.spiflash_phy, clk_freq=sys_clk_freq, mmap_endianness=self.cpu.endianness) + spiflash_region = SoCRegion(origin=self.mem_map.get("spiflash", None), size=W25Q128JV.total_size, cached=False) + self.bus.add_slave(name="spiflash", slave=self.spiflash_mmap.bus, region=spiflash_region) + else: + self.add_spi_flash(mode="1x", dummy_cycles=8) # Add ROM linker region -------------------------------------------------------------------- self.bus.add_region("rom", SoCRegion(