Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

software/liblitesdcard: fat16 boot working with both SPI and SD modes.

This commit is contained in:
Florent Kermarrec 2020-06-04 11:40:42 +02:00
parent bdaf6ff2dd
commit 8c6f74d483
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
litex/soc/software/bios/cmds/cmd_litesdcard.c
View File

@ -80,7 +80,7 @@ static void sdread(int nb_params, char **params)
return; return;
} }
sdcard_read(block, 0); sdcard_read(block*SD_BLOCK_SIZE, 0);
} }
define_command(sdread, sdread, "Read SDCard block", LITESDCARD_CMDS); define_command(sdread, sdread, "Read SDCard block", LITESDCARD_CMDS);
@ -109,7 +109,7 @@ static void sdwrite(int nb_params, char **params)
return; return;
} }
sdcard_write(block, params[1], 0); sdcard_write(block*SD_BLOCK_SIZE, params[1], 0);
} }
define_command(sdwrite, sdwrite, "Write SDCard block", LITESDCARD_CMDS); define_command(sdwrite, sdwrite, "Write SDCard block", LITESDCARD_CMDS);

26
litex/soc/software/liblitesdcard/sdcard.c
View File

@ -15,6 +15,7 @@
#include "sdcard.h" #include "sdcard.h"
#define SDCARD_DEBUG #define SDCARD_DEBUG
#define SDCARD_WAIT_WORKAROUND
#ifdef CSR_SDCORE_BASE #ifdef CSR_SDCORE_BASE
@ -154,7 +155,9 @@ int sdcard_wait_cmd_done(void) {
unsigned int cmdevt; unsigned int cmdevt;
while (1) { while (1) {
cmdevt = sdcore_cmdevt_read(); cmdevt = sdcore_cmdevt_read();
#ifdef SDCARD_WAIT_WORKAROUND
busy_wait(5); /* FIXME */ busy_wait(5); /* FIXME */
#endif
#ifdef SDCARD_DEBUG #ifdef SDCARD_DEBUG
printf("cmdevt: %08x\n", cmdevt); printf("cmdevt: %08x\n", cmdevt);
#endif #endif
@ -180,7 +183,9 @@ int sdcard_wait_data_done(void) {
unsigned int dataevt; unsigned int dataevt;
while (1) { while (1) {
dataevt = sdcore_dataevt_read(); dataevt = sdcore_dataevt_read();
#ifdef SDCARD_WAIT_WORKAROUND
busy_wait(5); /* FIXME */ busy_wait(5); /* FIXME */
#endif
#ifdef SDCARD_DEBUG #ifdef SDCARD_DEBUG
printf("dataevt: %08x\n", dataevt); printf("dataevt: %08x\n", dataevt);
#endif #endif
@ -622,7 +627,7 @@ int sdcard_init(void) {
extern void dump_bytes(unsigned int *ptr, int count, unsigned long addr); extern void dump_bytes(unsigned int *ptr, int count, unsigned long addr);
void sdcard_write(unsigned block, const char *data, char silent) void sdcard_write(unsigned int addr, const char *data, char silent)
{ {
#ifdef CSR_SDDATAWRITER_BASE #ifdef CSR_SDDATAWRITER_BASE
const char *c = data; const char *c = data;
@ -637,14 +642,14 @@ void sdcard_write(unsigned block, const char *data, char silent)
} }
} }
if (silent == 0) { if (silent == 0) {
printf("Writing SD block %d from mem:\n", block); printf("Writing SD block %d from mem:\n", addr/SD_BLOCK_SIZE);
dump_bytes((unsigned int *)SDWRITE_BASE, SD_BLOCK_SIZE, (unsigned long) SDWRITE_BASE); dump_bytes((unsigned int *)SDWRITE_BASE, SD_BLOCK_SIZE, (unsigned long) SDWRITE_BASE);
} }
sdcore_datawcrcclear_write(1); sdcore_datawcrcclear_write(1);
sdcard_set_block_count(1); sdcard_set_block_count(1);
sdcard_sddatawriter_start(); sdcard_sddatawriter_start();
sdcard_write_single_block(block * SD_BLOCK_SIZE); sdcard_write_single_block(addr);
sdcard_sddatawriter_wait(); sdcard_sddatawriter_wait();
sdcard_stop_transmission(); sdcard_stop_transmission();
#else #else
@ -652,7 +657,7 @@ void sdcard_write(unsigned block, const char *data, char silent)
#endif #endif
} }
void sdcard_read(unsigned block, char silent) void sdcard_read(unsigned int addr, char silent)
{ {
#ifdef CSR_SDDATAREADER_BASE #ifdef CSR_SDDATAREADER_BASE
int i; int i;
@ -660,11 +665,11 @@ void sdcard_read(unsigned block, char silent)
sdread_buf[i] = 0; sdread_buf[i] = 0;
} }
if (silent == 0) if (silent == 0)
printf("Reading SD block %d from mem:\n", block); printf("Reading SD block %d from mem:\n", addr/SD_BLOCK_SIZE);
sdcard_set_block_count(1); sdcard_set_block_count(1);
sdcard_sddatareader_start(); sdcard_sddatareader_start();
sdcard_read_single_block(block * SD_BLOCK_SIZE); sdcard_read_single_block(addr);
sdcard_sddatareader_wait(); sdcard_sddatareader_wait();
if (silent == 0) if (silent == 0)
@ -688,12 +693,12 @@ int sdcard_test(unsigned int blocks)
for(j=0; j<SD_BLOCK_SIZE; j++) for(j=0; j<SD_BLOCK_SIZE; j++)
sdwrite_buf[j] = (rand() + i) & 0xff; sdwrite_buf[j] = (rand() + i) & 0xff;
/* write block from write mem */ /* write block from write mem */
sdcard_write(i, NULL, 0); sdcard_write(i*SD_BLOCK_SIZE, NULL, 0);
busy_wait(100); /* FIXME */ busy_wait(100); /* FIXME */
/* read block to read mem */ /* read block to read mem */
sdcard_read(i, 0); sdcard_read(i*SD_BLOCK_SIZE, 0);
/* check read mem */ /* check read mem */
srand(0); srand(0);
for(j=0; j<SD_BLOCK_SIZE; j++) for(j=0; j<SD_BLOCK_SIZE; j++)
@ -730,12 +735,11 @@ uint8_t readSector(uint32_t sectorNumber, uint8_t *storage)
{ {
int n; int n;
// FIXME: handle errors. // FIXME: handle errors, svoid recopy.
sdcard_read(sectorNumber, 1); sdcard_read(sectorNumber, 1);
for(n=0; n<512; n++) for(n=0; n<SD_BLOCK_SIZE; n++)
storage[n] = sdread_buf[n]; storage[n] = sdread_buf[n];
return SUCCESS; return SUCCESS;
} }

4
litex/soc/software/liblitesdcard/sdcard.h
View File

@ -100,8 +100,8 @@ void sdcard_bist_checker_wait(void);
void hexdump(volatile const char *buf, size_t len); void hexdump(volatile const char *buf, size_t len);
int sdcard_init(void); int sdcard_init(void);
void sdcard_write(unsigned block, const char *data, char silent); void sdcard_write(unsigned int addr, const char *data, char silent);
void sdcard_read(unsigned block, char silent); void sdcard_read(unsigned int addr, char silent);
void sdcard_sddatawriter_start(void); void sdcard_sddatawriter_start(void);
void sdcard_sddatareader_start(void); void sdcard_sddatareader_start(void);
int sdcard_sddatawriter_wait(void); int sdcard_sddatawriter_wait(void);