Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'new' of github.com:m-labs/misoc into new

This commit is contained in:
Sebastien Bourdeauducq 2015-10-14 11:11:06 +08:00
parent ecc4c573eb f7787c3c13
commit 93a615ade4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
misoc/software/bios/main.c
View File

@ -510,9 +510,6 @@ static void boot_sequence(void)
if(test_user_abort()) { if(test_user_abort()) {
#ifdef FLASH_BOOT_ADDRESS #ifdef FLASH_BOOT_ADDRESS
flashboot(); flashboot();
#endif
#ifdef ROM_BOOT_ADDRESS
romboot();
#endif #endif
serialboot(); serialboot();
#ifdef CSR_ETHMAC_BASE #ifdef CSR_ETHMAC_BASE
@ -520,6 +517,9 @@ static void boot_sequence(void)
eth_mode(); eth_mode();
#endif #endif
netboot(); netboot();
#endif
#ifdef ROM_BOOT_ADDRESS
romboot();
#endif #endif
printf("No boot medium found\n"); printf("No boot medium found\n");
} }