From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Wed, 13 May 2020 06:44:17 +0000 (+0200)
Subject: bios/boot: review/fix #503.
X-Git-Tag: 24jan2021_ls180~346
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5ea3bae03609e472e7e4ab90d29cfdb94653798d;p=litex.git

bios/boot: review/fix #503.

- copy_image_from_flash_to_ram is now used by all CPUs.
- copy_image_from_flash_to_ram already show the flash address, no need to duplicate it.
---

diff --git a/litex/soc/software/bios/boot.c b/litex/soc/software/bios/boot.c
index c2fa4492..795b7b3a 100644
--- a/litex/soc/software/bios/boot.c
+++ b/litex/soc/software/bios/boot.c
@@ -399,7 +399,7 @@ static unsigned int check_image_in_flash(unsigned int base_address)
 	return length;
 }
 
-#if defined(MAIN_RAM_BASE) && defined(CONFIG_CPU_TYPE_VEXRISCV) && defined(FLASH_BOOT_ADDRESS)
+#if defined(MAIN_RAM_BASE) && defined(FLASH_BOOT_ADDRESS)
 static int copy_image_from_flash_to_ram(unsigned int flash_address, unsigned int ram_address)
 {
 	unsigned int length;
@@ -469,7 +469,7 @@ void flashboot(void)
 	}
 #endif
 
-	printf("Booting from flash addr 0x%08x...\n", FLASH_BOOT_ADDRESS);
+	printf("Booting from flash...\n");
 	length = check_image_in_flash(FLASH_BOOT_ADDRESS);
 	if(!length)
 		return;