From 3f649077b1e5e57403d720534736d3b42e415fa0 Mon Sep 17 00:00:00 2001 From: rprinz08 Date: Fri, 15 May 2020 12:07:52 +0200 Subject: [PATCH] Make booting from SD-Card to behave same as from SPI flash --- litex/soc/software/bios/boot.c | 35 ++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/litex/soc/software/bios/boot.c b/litex/soc/software/bios/boot.c index 795b7b3a9..2a757927f 100644 --- a/litex/soc/software/bios/boot.c +++ b/litex/soc/software/bios/boot.c @@ -512,19 +512,34 @@ void spisdcardboot(void) return; } -#if defined(CONFIG_CPU_TYPE_VEXRISCV) && defined(CONFIG_CPU_VARIANT_LINUX) - if(spi_sdcard_readFile("IMAGE","",MAIN_RAM_BASE+KERNEL_IMAGE_RAM_OFFSET)==0) return; - if(spi_sdcard_readFile("ROOTFS~1","CPI",MAIN_RAM_BASE+ROOTFS_IMAGE_RAM_OFFSET)==0) return; - if(spi_sdcard_readFile("RV32","DTB",MAIN_RAM_BASE+DEVICE_TREE_IMAGE_RAM_OFFSET)==0) return; - if(spi_sdcard_readFile("EMULATOR","BIN",MAIN_RAM_BASE+EMULATOR_IMAGE_RAM_OFFSET)==0) return; + unsigned int result; - boot(0,0,0,MAIN_RAM_BASE + EMULATOR_IMAGE_RAM_OFFSET); -#else - if(spi_sdcard_readFile("BOOT","BIN",MAIN_RAM_BASE)==0) { - printf("SD Card SPI boot failed\n"); +#if defined(CONFIG_CPU_TYPE_VEXRISCV) && defined(CONFIG_CPU_VARIANT_LINUX) + result = spi_sdcard_readFile("IMAGE", "", + MAIN_RAM_BASE + KERNEL_IMAGE_RAM_OFFSET); + + if(result) + result &= spi_sdcard_readFile("ROOTFS~1", "CPI", + MAIN_RAM_BASE + ROOTFS_IMAGE_RAM_OFFSET); + + if(result) + result &= spi_sdcard_readFile("RV32", "DTB", + MAIN_RAM_BASE + DEVICE_TREE_IMAGE_RAM_OFFSET); + + if(result) + result &= spi_sdcard_readFile("EMULATOR", "BIN", + MAIN_RAM_BASE + EMULATOR_IMAGE_RAM_OFFSET); + + if(result) { + boot(0, 0, 0, MAIN_RAM_BASE + EMULATOR_IMAGE_RAM_OFFSET); return; } - boot(0, 0, 0, MAIN_RAM_BASE); #endif + + result = spi_sdcard_readFile("BOOT", "BIN", MAIN_RAM_BASE); + if(result) + boot(0, 0, 0, MAIN_RAM_BASE); + else + printf("SD Card SPI boot failed\n"); } #endif