M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

bootloader: add no_flash_boot config option to force network boot

This commit is contained in:
Sebastien Bourdeauducq 2019-11-05 15:31:08 +08:00
parent e2f9f59472
commit 9dc82bd766
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artiq/firmware/bootloader/main.rs
View File

@ -14,7 +14,7 @@ use board_misoc::{ident, cache, sdram, boot, mem as board_mem};
#[cfg(has_slave_fpga_cfg)]
use board_misoc::slave_fpga;
#[cfg(has_ethmac)]
use board_misoc::{clock, ethmac, net_settings};
use board_misoc::{clock, ethmac, config, net_settings};
use board_misoc::uart_console::Console;
fn check_integrity() -> bool {
@ -420,9 +420,13 @@ pub extern fn main() -> i32 {
if startup() {
println!("");
#[cfg(has_slave_fpga_cfg)]
load_slave_fpga();
flash_boot();
if !config::read_str("no_flash_boot", |r| r == Ok("1")) {
#[cfg(has_slave_fpga_cfg)]
load_slave_fpga();
flash_boot();
} else {
println!("Flash booting has been disabled.");
}
#[cfg(has_ethmac)]
network_boot();
} else {