From 37f25ed37a246fc5397f4f3732322084b33477c1 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Thu, 19 Mar 2020 11:02:15 +0100 Subject: [PATCH] software/libbase/bios: rename spi.c/h to spisdcard.h, also rename functions. --- litex/soc/software/bios/boot.c | 6 +- litex/soc/software/bios/boot.h | 4 +- litex/soc/software/bios/main.c | 8 +- .../include/base/{spi.h => spisdcard.h} | 0 litex/soc/software/libbase/Makefile | 2 +- .../software/libbase/{spi.c => spisdcard.c} | 106 +++++++++--------- 6 files changed, 63 insertions(+), 63 deletions(-) rename litex/soc/software/include/base/{spi.h => spisdcard.h} (100%) rename litex/soc/software/libbase/{spi.c => spisdcard.c} (95%) diff --git a/litex/soc/software/bios/boot.c b/litex/soc/software/bios/boot.c index 355f20a08..4cf698cf4 100644 --- a/litex/soc/software/bios/boot.c +++ b/litex/soc/software/bios/boot.c @@ -489,10 +489,10 @@ void romboot(void) #endif // SPI HARDWARE BITBANG -#ifdef CSR_SPI_BASE -#include +#ifdef CSR_SPISDCARD_BASE +#include -void spisdboot(void) +void spisdcardboot(void) { printf("SD Card via SPI Initialising\n"); if(spi_sdcard_goidle() == 0) { diff --git a/litex/soc/software/bios/boot.h b/litex/soc/software/bios/boot.h index fd1d06a2e..f9517bad9 100644 --- a/litex/soc/software/bios/boot.h +++ b/litex/soc/software/bios/boot.h @@ -6,8 +6,8 @@ void netboot(void); void flashboot(void); void romboot(void); -#ifdef CSR_SPI_BASE -void spisdboot(void); +#ifdef CSR_SPISDCARD_BASE +void spisdcardboot(void); #endif #endif /* __BOOT_H */ diff --git a/litex/soc/software/bios/main.c b/litex/soc/software/bios/main.c index 460563f8b..5024e4f41 100644 --- a/litex/soc/software/bios/main.c +++ b/litex/soc/software/bios/main.c @@ -395,8 +395,8 @@ static void help(void) puts("sdram_mpr - read SDRAM MPR"); puts("sdram_mrwr reg value - write SDRAM mode registers"); #endif -#ifdef CSR_SPI_BASE - puts("spisdboot - boot from SDCard via SPI hardware bitbang"); +#ifdef CSR_SPISDCARD_BASE + puts("spisdcardboot - boot from SDCard via SPI hardware bitbang"); #endif } @@ -507,8 +507,8 @@ static void do_command(char *c) sdrhw(); } #endif -#ifdef CSR_SPI_BASE - else if(strcmp(token, "spisdboot") == 0) spisdboot(); +#ifdef CSR_SPISDCARD_BASE + else if(strcmp(token, "spisdcardboot") == 0) spisdcardboot(); #endif else if(strcmp(token, "") != 0) diff --git a/litex/soc/software/include/base/spi.h b/litex/soc/software/include/base/spisdcard.h similarity index 100% rename from litex/soc/software/include/base/spi.h rename to litex/soc/software/include/base/spisdcard.h diff --git a/litex/soc/software/libbase/Makefile b/litex/soc/software/libbase/Makefile index 7ccb4d0b8..e3a80a039 100755 --- a/litex/soc/software/libbase/Makefile +++ b/litex/soc/software/libbase/Makefile @@ -2,7 +2,7 @@ include ../include/generated/variables.mak include $(SOC_DIRECTORY)/software/common.mak OBJECTS=exception.o libc.o errno.o crc16.o crc32.o console.o \ - system.o id.o uart.o time.o qsort.o strtod.o spiflash.o spi.o strcasecmp.o mdio.o + system.o id.o uart.o time.o qsort.o strtod.o spiflash.o spisdcard.o strcasecmp.o mdio.o all: crt0-$(CPU)-ctr.o crt0-$(CPU)-xip.o libbase.a libbase-nofloat.a diff --git a/litex/soc/software/libbase/spi.c b/litex/soc/software/libbase/spisdcard.c similarity index 95% rename from litex/soc/software/libbase/spi.c rename to litex/soc/software/libbase/spisdcard.c index b602860ae..eafbf2f27 100644 --- a/litex/soc/software/libbase/spi.c +++ b/litex/soc/software/libbase/spisdcard.c @@ -20,11 +20,11 @@ #include #include -#ifdef CSR_SPI_BASE +#ifdef CSR_SPISDCARD_BASE // Import prototypes for the functions -#include +#include -// SPI +// SPI // cs line - high to indicate DESELECT // - low to indicate SELECT #define CS_HIGH 0x00 @@ -57,14 +57,14 @@ void spi_write_byte(unsigned char char_to_send) { // Place data into MOSI register // Pulse the START bit and set LENGTH=8 - spi_mosi_write(char_to_send); - spi_control_write(ONEBYTE | SPI_START); - + spisdcard_mosi_write(char_to_send); + spisdcard_control_write(ONEBYTE | SPI_START); + // Wait for DONE - while( (spi_status_read() != SPI_DONE)) {} - + while( (spisdcard_status_read() != SPI_DONE)) {} + // Signal end of transfer - spi_control_write( 0x00 ); + spisdcard_control_write( 0x00 ); } @@ -83,16 +83,16 @@ unsigned char spi_read_rbyte(void); unsigned char spi_read_rbyte(void) { int timeout=32; - unsigned char r=0; - + unsigned char r=0; + // Check if MISO is 0x0xxxxxxx as MSB=0 indicates valid response - r = spi_miso_read(); + r = spisdcard_miso_read(); while( ((r&0x80)!=0) && timeout>0) { - spi_mosi_write( 0xff ); - spi_control_write(ONEBYTE | SPI_START); - while( (spi_status_read() != SPI_DONE)) {} - r = spi_miso_read(); - spi_control_write( 0x00 ); + spisdcard_mosi_write( 0xff ); + spisdcard_control_write(ONEBYTE | SPI_START); + while( (spisdcard_status_read() != SPI_DONE)) {} + r = spisdcard_miso_read(); + spisdcard_control_write( 0x00 ); timeout--; } @@ -117,10 +117,10 @@ unsigned char spi_read_byte(void); unsigned char spi_read_byte(void) { unsigned char r=0; - + spi_write_byte( 0xff ); - r = spi_miso_read(); - + r = spisdcard_miso_read(); + return r; } @@ -142,26 +142,26 @@ unsigned char spi_setspimode(void) // Send pulses do { // set CS HIGH and send pulses - spi_cs_write(CS_HIGH); + spisdcard_cs_write(CS_HIGH); for (i=0; i<10; i++) { - spi_write_byte( 0xff ); + spi_write_byte( 0xff ); } - + // set CS LOW and send pulses - spi_cs_write(CS_LOW); + spisdcard_cs_write(CS_LOW); r = spi_read_rbyte(); - + timeout--; } while ( (timeout>0) && (r==0) ); if(timeout==0) return FAILURE; - + return SUCCESS; } // SPI_SDCARD_GOIDLE // Function exposed to BIOS to initialise SPI mode -// +// // Sequence // Set 100KHz timer mode // Send CLK pulses to set SD CARD to SPI mode @@ -188,7 +188,7 @@ unsigned char spi_sdcard_goidle(void) spi_write_byte( 0xff ); spi_write_byte( 0x40 ); spi_write_byte( 0x00 ); spi_write_byte( 0x00 ); spi_write_byte( 0x00 ); spi_write_byte( 0x00 ); spi_write_byte( 0x95 ); r = spi_read_rbyte(); if(r!=0x01) return FAILURE; - + // CMD8 - Check SD CARD type // Command sequence is DUMMY=0xff CMD8=0x48 0x00 0x00 0x01 0xaa CRC=0x87 // Expected R7 response is 0x01 followed by 0x00 0x00 0x01 0xaa (these trailing 4 bytes not currently checked) @@ -198,7 +198,7 @@ unsigned char spi_sdcard_goidle(void) // Receive the trailing 4 bytes for R7 response - FIXME should check for 0x00 0x00 0x01 0xaa for(i=0; i<4; i++) r=spi_read_byte(); - + // CMD55+ACMD41 - Force SD CARD READY - prepare card for reading/writing // Command sequence is CMD55 followed by ACMD41 // Send commands repeatedly until SD CARD indicates READY 0x00 @@ -207,15 +207,15 @@ unsigned char spi_sdcard_goidle(void) // Expected R1 response is 0x00 indicating SD CARD is READY timeout=32; do { - spi_write_byte( 0xff ); spi_write_byte( 0x77 ); spi_write_byte( 0x00 ); spi_write_byte( 0x00 ); spi_write_byte( 0x00 ); spi_write_byte( 0x00 ); spi_write_byte( 0x00 ); + spi_write_byte( 0xff ); spi_write_byte( 0x77 ); spi_write_byte( 0x00 ); spi_write_byte( 0x00 ); spi_write_byte( 0x00 ); spi_write_byte( 0x00 ); spi_write_byte( 0x00 ); r = spi_read_rbyte(); - - spi_write_byte( 0xff ); spi_write_byte( 0x69 ); spi_write_byte( 0x40 ); spi_write_byte( 0x00 ); spi_write_byte( 0x00 ); spi_write_byte( 0x00 ); spi_write_byte( 0x00 ); + + spi_write_byte( 0xff ); spi_write_byte( 0x69 ); spi_write_byte( 0x40 ); spi_write_byte( 0x00 ); spi_write_byte( 0x00 ); spi_write_byte( 0x00 ); spi_write_byte( 0x00 ); r = spi_read_rbyte(); timeout--; } while ((r != 0x00) && (timeout>0)); if(r!=0x00) return FAILURE; - + // CMD58 - Read SD CARD OCR (status register) // FIXME - Find details on expected response from CMD58 to allow accurate checking of SD CARD R3 response // Command sequence is DUMMY=0xff CMD58=0x7a 0x00 0x00 0x01 0xaa CRC=0xff @@ -226,12 +226,12 @@ unsigned char spi_sdcard_goidle(void) // // Receive the trailing 4 bytes for R3 response for(i=0; i<4; i++) r=spi_read_byte(); - + // CMD16 - Set SD CARD block size to 512 - Sector Size for the SD CARD // Command Sequence is DUMMY=0xff (512 as unsigned long = 0x00000200) 0x00 0x00 0x02 0x00 CRC=0xff // Expected R1 response is 0x00 indicating SD CARD is READY spi_write_byte( 0xff ); spi_write_byte( 0x50 ); spi_write_byte( 0x00 ); spi_write_byte( 0x00 ); spi_write_byte( 0x02 ); spi_write_byte( 0x00 ); spi_write_byte( 0xff ); - r=spi_read_rbyte(); + r=spi_read_rbyte(); if(r!=0x00) return FAILURE; return SUCCESS; @@ -256,11 +256,11 @@ unsigned char readSector(unsigned int sectorNumber, unsigned char *storage) { unsigned int n,timeout; // Number of bytes loop, timeout loop awaiting response bytes unsigned char r; // Response bytes from SD CARD - + // CMD17 - Read Block // Command Sequence is DUMMY=0xff CMD17=0x51 SECTORNUMBER (32bit UNSIGNED as bits 32-25,24-17, 16-9, 8-1) CRC=0xff // Expected R1 response is 0x00 indicating SD CARD is processing - spi_write_byte( 0xff ); spi_write_byte( 0x51 ); spi_write_byte( (sectorNumber>>24)&0xff ); spi_write_byte( (sectorNumber>>16)&0xff ); spi_write_byte( (sectorNumber>>8)&0xff ); spi_write_byte( (sectorNumber)&0xff ); spi_write_byte( 0xff ); + spi_write_byte( 0xff ); spi_write_byte( 0x51 ); spi_write_byte( (sectorNumber>>24)&0xff ); spi_write_byte( (sectorNumber>>16)&0xff ); spi_write_byte( (sectorNumber>>8)&0xff ); spi_write_byte( (sectorNumber)&0xff ); spi_write_byte( 0xff ); r=spi_read_rbyte(); if( r!=0x00 ) return FAILURE; @@ -269,14 +269,14 @@ unsigned char readSector(unsigned int sectorNumber, unsigned char *storage) timeout=16384; while( (r!=0xfe) && (timeout>0) ) { r=spi_read_byte(); - timeout--; + timeout--; } if( r!=0xfe ) return FAILURE; // Read 512 bytes into storage for(n=0; n<512; n++) storage[n]=spi_read_byte(); - + // Read 8 dummy bytes for(n=0; n<8; n++) r=spi_read_byte(); @@ -316,7 +316,7 @@ typedef struct { unsigned short number_of_heads; unsigned long hidden_sectors; unsigned long total_sectors_long; - + unsigned char drive_number; unsigned char current_head; unsigned char boot_signature; @@ -340,7 +340,7 @@ typedef struct { unsigned short modify_date; unsigned short starting_cluster; unsigned long file_size; -} __attribute((packed)) Fat16Entry; +} __attribute((packed)) Fat16Entry; Fat16Entry *sdCardFat16RootDir; @@ -367,13 +367,13 @@ unsigned char spi_sdcard_readMBR(void) { int i, n; - // Read Sector 0x00000000 + // Read Sector 0x00000000 printf("Reading MBR\n"); if( readSector(0x00000000, sdCardSector)==SUCCESS ) { // Copy Partition 1 Entry from byte 0x1be // FIXME should check 0x55 0xaa at end of sector memcpy(&sdCardPartition, &sdCardSector[0x1be], sizeof(PartitionTable)); - + // Check Partition 1 is valid, FIRST_BYTE=0x00 or 0x80 // Check Partition 1 has type 4, 6 or 14 (FAT16 of various sizes) printf("Partition 1 Information: Active=0x%02x, Type=0x%02x, LBAStart=0x%08x\n", sdCardPartition.first_byte, sdCardPartition.partition_type, sdCardPartition.start_sector); @@ -403,7 +403,7 @@ unsigned char spi_sdcard_readMBR(void) printf("Failed to read FAT16 Boot Sector\n"); return FAILURE; } - + // Print details of Parition 1 printf(" Jump Code: 0x%02x 0x%02x 0x%02x\n",sdCardFatBootSector.jmp[0],sdCardFatBootSector.jmp[1],sdCardFatBootSector.jmp[2]); printf(" OEM Code: ["); @@ -441,12 +441,12 @@ unsigned char spi_sdcard_readMBR(void) printf("Error reading FAT16 Boot Sector\n"); return FAILURE; } - + // Read in FAT16 File Allocation Table, array of 16bit unsinged integers // Calculate Storage from TOP of MAIN RAM sdCardFatTable = (unsigned short *)(MAIN_RAM_BASE+MAIN_RAM_SIZE-sdCardFatBootSector.sector_size*sdCardFatBootSector.fat_size_sectors); printf("sdCardFatTable = 0x%08x Reading Fat16 Table (%d Sectors Long)\n\n",sdCardFatTable,sdCardFatBootSector.fat_size_sectors); - + // Calculate Start of FAT16 File Allocation Table (start of partition plus reserved sectors) fatSectorStart=sdCardPartition.start_sector+sdCardFatBootSector.reserved_sectors; for(n=0; n