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 3893141444ee476adb53c66d4262342f0bf1880a..a0cc0fecf85b0d7f2927400207f192ac642651fa 100644 (file)
--- 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");
        }