From 492f276247adcb2b0c2a893e9b82db9de9fbb680 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Thu, 14 Jan 2016 16:46:42 +0100 Subject: [PATCH] soc/software/bios/main: give priority to romboot over serialboot/netboot --- litex/soc/software/bios/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/litex/soc/software/bios/main.c b/litex/soc/software/bios/main.c index 7b9ed4469..9b5871448 100644 --- a/litex/soc/software/bios/main.c +++ b/litex/soc/software/bios/main.c @@ -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"); }