soc/software/bios/main: give priority to romboot over serialboot/netboot
authorFlorent Kermarrec <florent@enjoy-digital.fr>
Thu, 14 Jan 2016 15:46:42 +0000 (16:46 +0100)
committerFlorent Kermarrec <florent@enjoy-digital.fr>
Thu, 14 Jan 2016 15:46:42 +0000 (16:46 +0100)
litex/soc/software/bios/main.c

index 7b9ed4469f6cc1613791ef0a169084a3922a7647..9b587144886e286c35d491ac631a1f0a91c5cdcb 100644 (file)
@@ -499,6 +499,9 @@ 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
@@ -506,9 +509,6 @@ static void boot_sequence(void)
                eth_mode();
 #endif
                netboot();
-#endif
-#ifdef ROM_BOOT_ADDRESS
-               romboot();
 #endif
                printf("No boot medium found\n");
        }