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.
m-labs · Oct 13, 2015 · f7787c3 · f7787c3
1 parent e96eba4
commit f7787c3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/misoc/software/bios/main.c b/misoc/software/bios/main.c
@@ -510,16 +510,16 @@ 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
 #ifdef CSR_ETHPHY_MODE_DETECTION_MODE_ADDR
 		eth_mode();
 #endif
 		netboot();
+#endif
+#ifdef ROM_BOOT_ADDRESS
+		romboot();
 #endif
 		printf("No boot medium found\n");
 	}