From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Tue, 13 Oct 2015 15:49:29 +0000 (+0200)
Subject: software/bios: move romboot after serialboot and netboot
X-Git-Tag: 24jan2021_ls180~2108
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9041868291be0d55e4cf2295999f3b09f6ea8778;p=litex.git

software/bios: move romboot after serialboot and netboot

On designs using romboot (firmware embedded in ram blocks), we generally upload new firmwares with serialboot and netboot for prototyping.
Moving romboot after serialboot and netboot avoid manual interrupts of the boot sequence.
---

diff --git a/software/bios/main.c b/software/bios/main.c
index 38931414..a0cc0fec 100644
--- a/software/bios/main.c
+++ b/software/bios/main.c
@@ -512,9 +512,6 @@ static void boot_sequence(void)
 	if(test_user_abort()) {
 #ifdef FLASH_BOOT_ADDRESS
 		flashboot();
-#endif
-#ifdef ROM_BOOT_ADDRESS
-		romboot();
 #endif
 		serialboot();
 #ifdef CSR_ETHMAC_BASE
@@ -522,6 +519,9 @@ static void boot_sequence(void)
 		eth_mode();
 #endif
 		netboot();
+#endif
+#ifdef ROM_BOOT_ADDRESS
+		romboot();
 #endif
 		printf("No boot medium found\n");
 	}