From f7787c3c1332f946969d6c5eb1f461c47e599186 Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Tue, 13 Oct 2015 18:13:00 +0200
Subject: [PATCH] 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.
---
 misoc/software/bios/main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/misoc/software/bios/main.c b/misoc/software/bios/main.c
index 1316665bd..0da623add 100644
--- a/misoc/software/bios/main.c
+++ b/misoc/software/bios/main.c
@@ -510,9 +510,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
@@ -520,6 +517,9 @@ static void boot_sequence(void)
 		eth_mode();
 #endif
 		netboot();
+#endif
+#ifdef ROM_BOOT_ADDRESS
+		romboot();
 #endif
 		printf("No boot medium found\n");
 	}