mirror of
https://github.com/enjoy-digital/litex.git
synced 2025-01-04 09:52:26 -05:00
Merge branch 'new' of github.com:m-labs/misoc into new
This commit is contained in:
commit
93a615ade4
1 changed files with 3 additions and 3 deletions
|
@ -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");
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue