From 20ce982da20c2cfb6b0b7ea634b922cccb7b739f Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Wed, 26 Jul 2023 16:30:52 +0200 Subject: [PATCH] software/bios: Fix missing CSR_SDCARD_CORE_BASE update. --- litex/soc/software/bios/boot.c | 4 ++-- litex/soc/software/bios/cmds/cmd_boot.c | 2 +- litex/soc/software/bios/main.c | 2 +- litex/soc/software/liblitesdcard/sdcard.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/litex/soc/software/bios/boot.c b/litex/soc/software/bios/boot.c index 39233fcee..5ade1c89c 100755 --- a/litex/soc/software/bios/boot.c +++ b/litex/soc/software/bios/boot.c @@ -657,7 +657,7 @@ void flashboot(void) /* SDCard Boot */ /*-----------------------------------------------------------------------*/ -#if defined(CSR_SPISDCARD_BASE) || defined(CSR_SDCORE_BASE) +#if defined(CSR_SPISDCARD_BASE) || defined(CSR_SDCARD_CORE_BASE) static int copy_file_from_sdcard_to_ram(const char * filename, unsigned long ram_address) { @@ -814,7 +814,7 @@ void sdcardboot(void) printf("Booting from SDCard in SPI-Mode...\n"); fatfs_set_ops_spisdcard(); /* use spisdcard disk access ops */ #endif -#ifdef CSR_SDCORE_BASE +#ifdef CSR_SDCARD_CORE_BASE printf("Booting from SDCard in SD-Mode...\n"); fatfs_set_ops_sdcard(); /* use sdcard disk access ops */ #endif diff --git a/litex/soc/software/bios/cmds/cmd_boot.c b/litex/soc/software/bios/cmds/cmd_boot.c index ed3061cb0..0a9b0df63 100644 --- a/litex/soc/software/bios/cmds/cmd_boot.c +++ b/litex/soc/software/bios/cmds/cmd_boot.c @@ -122,7 +122,7 @@ define_command(netboot, netboot, "Boot via Ethernet (TFTP)", BOOT_CMDS); * Boot software from SDcard * */ -#if defined(CSR_SPISDCARD_BASE) || defined(CSR_SDCORE_BASE) +#if defined(CSR_SPISDCARD_BASE) || defined(CSR_SDCARD_CORE_BASE) define_command(sdcardboot, sdcardboot, "Boot from SDCard", BOOT_CMDS); #endif diff --git a/litex/soc/software/bios/main.c b/litex/soc/software/bios/main.c index eadda868d..69fbd22af 100644 --- a/litex/soc/software/bios/main.c +++ b/litex/soc/software/bios/main.c @@ -63,7 +63,7 @@ static void boot_sequence(void) #ifdef ROM_BOOT_ADDRESS romboot(); #endif -#if defined(CSR_SPISDCARD_BASE) || defined(CSR_SDCORE_BASE) +#if defined(CSR_SPISDCARD_BASE) || defined(CSR_SDCARD_CORE_BASE) sdcardboot(); #endif #if defined(CSR_SATA_SECTOR2MEM_BASE) diff --git a/litex/soc/software/liblitesdcard/sdcard.h b/litex/soc/software/liblitesdcard/sdcard.h index 8a132fcda..b6e25833e 100644 --- a/litex/soc/software/liblitesdcard/sdcard.h +++ b/litex/soc/software/liblitesdcard/sdcard.h @@ -109,7 +109,7 @@ void sdcard_read(uint32_t sector, uint32_t count, uint8_t* buf); void sdcard_write(uint32_t sector, uint32_t count, uint8_t* buf); void fatfs_set_ops_sdcard(void); -#endif /* CSR_SDCORE_BASE */ +#endif /* CSR_SDCARD_CORE_BASE */ #ifdef __cplusplus }