software/liblitespi/spiflash: review/simplify/update and test on arty.

litex/soc/software/bios/main.c

@@ -131,9 +131,9 @@ int main(int i, char **c)
 		printf("Memory initialization failed\n");
 	printf("\n");
 #endif
-//#ifdef CSR_SPI_BASE
+#ifdef CSR_SPIFLASH_MMAP_BASE
-//	spi_autoconfig();
+	spiflash_init();
-//#endif
+#endif
 
 	if(sdr_ok) {
 		printf("--============== \e[1mBoot\e[0m ==================--\n");

litex/soc/software/liblitespi/spiflash.c

@@ -12,25 +12,25 @@
 
 #include "spiflash.h"
 
-#ifdef SPIXIP_BASE
+#ifdef CSR_SPIFLASH_MMAP_BASE
 
 #define DEBUG	0
 #define USER_DEFINED_DUMMY_BITS	0
 
 static spi_mode spi_get_mode(void)
 {
-	return (spi_mode)spi_cfg_read();
+	return (spi_mode)spiflash_mmap_cfg_read();
 }
 
 static void spi_set_mode(spi_mode mode)
 {
-	spi_cfg_write((unsigned char)mode);
+	spiflash_mmap_cfg_write((unsigned char)mode);
 }
 
-int spi_frequency_test(void)
+int spiflash_freq_init(void)
 {
-	unsigned int lowest_div = spi_clk_divisor_read();
+	unsigned int lowest_div = spiflash_mmap_clk_divisor_read();
-	unsigned int crc = crc32((unsigned char *)SPIXIP_BASE, SPI_FLASH_BLOCK_SIZE);
+	unsigned int crc = crc32((unsigned char *)SPIFLASH_BASE, SPI_FLASH_BLOCK_SIZE);
 	unsigned int crc_test = crc;
 
 #if DEBUG
@@ -43,42 +43,45 @@ int spi_frequency_test(void)
 
 	/* Check if block is erased (filled with 0xFF) */
 	if(crc == CRC32_ERASED_FLASH) {
-		printf("Block of size %d, started on address 0x%x is erased. Cannot proceed with SPI frequency test.\n\r", SPI_FLASH_BLOCK_SIZE, SPIXIP_BASE);
+		printf("Block of size %d, started on address 0x%x is erased. Cannot proceed with SPI frequency test.\n\r", SPI_FLASH_BLOCK_SIZE, SPIFLASH_BASE);
 		return -1;
 	}
 
 	for(int i = lowest_div; (crc == crc_test) && (i >= 0); i--) {
 		lowest_div = i;
-		spi_clk_divisor_write((uint32_t)i);
+		spiflash_mmap_clk_divisor_write((uint32_t)i);
-		crc_test = crc32((unsigned char *)SPIXIP_BASE, SPI_FLASH_BLOCK_SIZE);
+		crc_test = crc32((unsigned char *)SPIFLASH_BASE, SPI_FLASH_BLOCK_SIZE);
 #if DEBUG
 		printf("[DIV: %d] %08x\n\r", i, crc_test);
 #endif
 	}
 	lowest_div++;
-	printf("Maximum available frequency: %d Hz\n\r", (spi_sys_clk_freq_read()/(2*(1 + lowest_div))));
+	printf("SPIFlash freq configured to %d MHz\n", (spiflash_mmap_sys_clk_freq_read()/(2*(1 + lowest_div)))/1000000);
 
-	return lowest_div;
+	spiflash_mmap_clk_divisor_write(lowest_div);
+
+	return 0;
 }
 
 #endif
 
-void spi_dummy_bits_setup(unsigned int dummy_bits)
+void spiflash_dummy_bits_setup(unsigned int dummy_bits)
 {
-	spi_dummy_bits_write((uint32_t)dummy_bits);
+	spiflash_mmap_dummy_bits_write((uint32_t)dummy_bits);
 #if DEBUG
 	printf("Dummy bits set to: %d\n\r", spi_dummy_bits_read());
 #endif
 }
 
-void spi_autoconfig(void)
+void spiflash_init(void)
 {
-	int ret = spi_frequency_test();
+	int ret;
-	if(ret < 0) {
+
+	printf("Initializing SPIFlash...\n");
+
+	ret = spiflash_freq_init();
+	if (ret < 0)
 		return;
-	} else {
-		spi_clk_divisor_write((uint32_t)ret);
-	}
 #if (USER_DEFINED_DUMMY_BITS > 0)
 	spi_dummy_bits_setup(USER_DEFINED_DUMMY_BITS);
 #endif

litex/soc/software/liblitespi/spiflash.h

@@ -11,8 +11,8 @@ typedef enum {
 	SPI_MODE_MASTER = 1,
 } spi_mode;
 
-int spi_frequency_test(void);
+int spiflash_freq_init(void);
-void spi_dummy_bits_setup(unsigned int dummy_bits);
+void spiflash_dummy_bits_setup(unsigned int dummy_bits);
-void spi_autoconfig(void);
+void spiflash_init(void);
 
 #endif /* __LITESPI_FLASH_H */