From 9041868291be0d55e4cf2295999f3b09f6ea8778 Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Tue, 13 Oct 2015 17:49:29 +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.
---
 software/bios/main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/software/bios/main.c b/software/bios/main.c
index 389314144..a0cc0fecf 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");
 	}