Hardware/litex
1
0
Fork 0
mirror of https://github.com/enjoy-digital/litex.git synced 2025-01-04 09:52:26 -05:00
Code Issues Projects Releases Packages Wiki Activity

integration/soc/sdcard: cleanup emulator integration, fix sim.

Browse source
This commit is contained in:
Florent Kermarrec 2020-07-07 15:05:07 +02:00
parent 7602977c16
commit 52f36b1257
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
litex/soc/integration/soc.py
View file

@ -1244,23 +1244,24 @@ class LiteXSoC(SoC):
self.add_csr(name)
# Add SDCard -----------------------------------------------------------------------------------
def add_sdcard(self, name="sdcard", with_emulator=False):
def add_sdcard(self, name="sdcard", use_emulator=False):
# Imports
from litesdcard.emulator import SDEmulator
from litesdcard.phy import SDPHY
from litesdcard.core import SDCore
from litesdcard.frontend.dma import SDBlock2MemDMA, SDMem2BlockDMA
# Emulator / Pads
if with_emulator:
from litesdcard.emulator import SDEmulator
self.submodules.sdemulator = SDEmulator(self.platform)
sdcard_pads = self.sdemulator.pads
if use_emulator:
sdemulator = SDEmulator(self.platform)
self.submodules += sdemulator
sdcard_pads = sdemulator.pads
else:
sdcard_pads = self.platform.request(name)
# Core
self.submodules.sdphy = SDPHY(sdcard_pads, self.platform.device, self.clk_freq)
self.submodules.sdcore = SDCore(self.sdphy)
self.submodules.sdphy = SDPHY(sdcard_pads, self.platform.device, self.clk_freq)
self.submodules.sdcore = SDCore(self.sdphy)
self.add_csr("sdphy")
self.add_csr("sdcore")

2
litex/soc/software/liblitesdcard/sdcard.c
View file

@ -562,7 +562,9 @@ sdcard_set_block_count(count);
/* Flush CPU caches */
flush_cpu_dcache();
#ifdef CONFIG_L2_SIZE
flush_l2_cache();
#endif
}
void sdcard_write(uint32_t sector, uint32_t count, uint8_t* buf)

2
litex/tools/litex_sim.py
View file

@ -309,7 +309,7 @@ class SimSoC(SoCCore):
# SDCard -----------------------------------------------------------------------------------
if with_sdcard:
self.add_sdcard("sdcard", with_emulator=True)
self.add_sdcard("sdcard", use_emulator=True)
# Build --------------------------------------------------------------------------------------------