Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
litex
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jonathan Currier
litex
Commits
468db3cf
Commit
468db3cf
authored
Jul 10, 2020
by
Florent Kermarrec
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
integration/soc/sdcard: add mode parameter to enable read only, write only or read+write modes.
parent
b7e45076
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
13 deletions
+23
-13
litex/soc/integration/soc.py
litex/soc/integration/soc.py
+14
-11
litex/soc/software/bios/cmds/cmd_litesdcard.c
litex/soc/software/bios/cmds/cmd_litesdcard.c
+2
-2
litex/soc/software/liblitesdcard/sdcard.c
litex/soc/software/liblitesdcard/sdcard.c
+7
-0
No files found.
litex/soc/integration/soc.py
View file @
468db3cf
...
...
@@ -1244,7 +1244,8 @@ class LiteXSoC(SoC):
self
.
add_csr
(
name
)
# Add SDCard -----------------------------------------------------------------------------------
def
add_sdcard
(
self
,
name
=
"sdcard"
,
use_emulator
=
False
):
def
add_sdcard
(
self
,
name
=
"sdcard"
,
mode
=
"read+write"
,
use_emulator
=
False
):
assert
mode
in
[
"read"
,
"write"
,
"read+write"
]
# Imports
from
litesdcard.emulator
import
SDEmulator
from
litesdcard.phy
import
SDPHY
...
...
@@ -1266,15 +1267,17 @@ class LiteXSoC(SoC):
self
.
add_csr
(
"sdcore"
)
# Block2Mem DMA
bus
=
wishbone
.
Interface
(
data_width
=
self
.
bus
.
data_width
,
adr_width
=
self
.
bus
.
address_width
)
self
.
submodules
.
sdblock2mem
=
SDBlock2MemDMA
(
bus
=
bus
,
endianness
=
self
.
cpu
.
endianness
)
self
.
comb
+=
self
.
sdcore
.
source
.
connect
(
self
.
sdblock2mem
.
sink
)
self
.
bus
.
add_master
(
"sdblock2mem"
,
master
=
bus
)
self
.
add_csr
(
"sdblock2mem"
)
if
"read"
in
mode
:
bus
=
wishbone
.
Interface
(
data_width
=
self
.
bus
.
data_width
,
adr_width
=
self
.
bus
.
address_width
)
self
.
submodules
.
sdblock2mem
=
SDBlock2MemDMA
(
bus
=
bus
,
endianness
=
self
.
cpu
.
endianness
)
self
.
comb
+=
self
.
sdcore
.
source
.
connect
(
self
.
sdblock2mem
.
sink
)
self
.
bus
.
add_master
(
"sdblock2mem"
,
master
=
bus
)
self
.
add_csr
(
"sdblock2mem"
)
# Mem2Block DMA
bus
=
wishbone
.
Interface
(
data_width
=
self
.
bus
.
data_width
,
adr_width
=
self
.
bus
.
address_width
)
self
.
submodules
.
sdmem2block
=
SDMem2BlockDMA
(
bus
=
bus
,
endianness
=
self
.
cpu
.
endianness
)
self
.
comb
+=
self
.
sdmem2block
.
source
.
connect
(
self
.
sdcore
.
sink
)
self
.
bus
.
add_master
(
"sdmem2block"
,
master
=
bus
)
self
.
add_csr
(
"sdmem2block"
)
if
"write"
in
mode
:
bus
=
wishbone
.
Interface
(
data_width
=
self
.
bus
.
data_width
,
adr_width
=
self
.
bus
.
address_width
)
self
.
submodules
.
sdmem2block
=
SDMem2BlockDMA
(
bus
=
bus
,
endianness
=
self
.
cpu
.
endianness
)
self
.
comb
+=
self
.
sdmem2block
.
source
.
connect
(
self
.
sdcore
.
sink
)
self
.
bus
.
add_master
(
"sdmem2block"
,
master
=
bus
)
self
.
add_csr
(
"sdmem2block"
)
litex/soc/software/bios/cmds/cmd_litesdcard.c
View file @
468db3cf
...
...
@@ -27,7 +27,7 @@ define_command(sdinit, sdcard_init, "Initialize SDCard", LITESDCARD_CMDS);
* Perform SDcard block read
*
*/
#ifdef CSR_SD
CORE
_BASE
#ifdef CSR_SD
BLOCK2MEM
_BASE
static
void
sdread
(
int
nb_params
,
char
**
params
)
{
unsigned
int
block
;
...
...
@@ -58,7 +58,7 @@ define_command(sdread, sdread, "Read SDCard block", LITESDCARD_CMDS);
* Perform SDcard block write
*
*/
#ifdef CSR_SD
CORE
_BASE
#ifdef CSR_SD
MEM2BLOCK
_BASE
static
void
sdwrite
(
int
nb_params
,
char
**
params
)
{
int
i
;
...
...
litex/soc/software/liblitesdcard/sdcard.c
View file @
468db3cf
...
...
@@ -555,6 +555,8 @@ int sdcard_init(void) {
return
1
;
}
#ifdef CSR_SDBLOCK2MEM_BASE
void
sdcard_read
(
uint32_t
sector
,
uint32_t
count
,
uint8_t
*
buf
)
{
/* Initialize DMA Writer */
...
...
@@ -581,6 +583,10 @@ sdcard_set_block_count(count);
#endif
}
#endif
#ifdef CSR_SDMEM2BLOCK_BASE
void
sdcard_write
(
uint32_t
sector
,
uint32_t
count
,
uint8_t
*
buf
)
{
while
(
count
--
)
{
...
...
@@ -606,6 +612,7 @@ void sdcard_write(uint32_t sector, uint32_t count, uint8_t* buf)
sector
+=
1
;
}
}
#endif
/*-----------------------------------------------------------------------*/
/* SDCard FatFs disk functions */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment