From 6ab13a0661d8a629c8c4bc3486d54e707d1ce0d7 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Thu, 19 Mar 2020 11:09:48 +0100 Subject: [PATCH] de10nano/MiSTer: rename SPI SD CARD pins to spisdcard and remove SPI SD Card integration from target. --- litex_boards/platforms/de10nano.py | 11 +++++------ litex_boards/targets/de10nano.py | 9 --------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/litex_boards/platforms/de10nano.py b/litex_boards/platforms/de10nano.py index b041e95..01ca273 100644 --- a/litex_boards/platforms/de10nano.py +++ b/litex_boards/platforms/de10nano.py @@ -102,12 +102,11 @@ _mister_sdram_module_io = [ IOStandard("3.3-V LVTTL") ), - # SPI SD CARD HARDWARE BITBANGING - ("spi",0, - Subsignal("clk", Pins("AH26")), - Subsignal("mosi", Pins("AF27")), - Subsignal("cs_n", Pins("AF28")), - Subsignal("miso", Pins("AF25")), + ("spisdcard", 0, + Subsignal("clk", Pins("AH26")), + Subsignal("mosi", Pins("AF27")), + Subsignal("cs_n", Pins("AF28")), + Subsignal("miso", Pins("AF25")), IOStandard("3.3-V LVTTL") ), ] diff --git a/litex_boards/targets/de10nano.py b/litex_boards/targets/de10nano.py index a7a1961..aceaadd 100755 --- a/litex_boards/targets/de10nano.py +++ b/litex_boards/targets/de10nano.py @@ -17,9 +17,6 @@ from litex.soc.integration.builder import * from litedram.modules import AS4C16M16 from litedram.phy import GENSDRPHY -#SPI SD CARD HARDWARE BITBANGING -from litex.soc.cores.spi import SPIMaster - # CRG ---------------------------------------------------------------------------------------------- class _CRG(Module): @@ -106,12 +103,6 @@ class MiSTerSDRAMSoC(SoCSDRAM): geom_settings = sdram_module.geom_settings, timing_settings = sdram_module.timing_settings) - # SPI SDCARD HARDWARE BITBANGING - spi_pads = self.platform.request("spi") - self.add_csr("spi") - spi_clk_freq = 400e3 - self.submodules.spi = SPIMaster(spi_pads, 8, sys_clk_freq, spi_clk_freq) - # Build -------------------------------------------------------------------------------------------- def main():