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/misoc/software/bios/main.c b/misoc/software/bios/main.c
index 1316665bd5cf227867f2ed3e1143d0bc553b9489..0da623add3cf9d31580476368fe721f45dc884b4 100644 (file)
--- 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");
        }