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

firmware: version → ident

This commit is contained in:
Sebastien Bourdeauducq 2018-07-15 17:40:17 +08:00
parent b2695d03ed
commit 13984385a8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/firmware/runtime/main.rs
View File

@ -66,8 +66,8 @@ fn startup() {
irq::set_ie(true); irq::set_ie(true);
clock::init(); clock::init();
info!("ARTIQ runtime starting..."); info!("ARTIQ runtime starting...");
info!("software version {}", csr::CONFIG_IDENTIFIER_STR); info!("software ident {}", csr::CONFIG_IDENTIFIER_STR);
info!("gateware version {}", ident::read(&mut [0; 64])); info!("gateware ident {}", ident::read(&mut [0; 64]));
match config::read_str("log_level", |r| r.map(|s| s.parse())) { match config::read_str("log_level", |r| r.map(|s| s.parse())) {
Ok(Ok(log_level_filter)) => { Ok(Ok(log_level_filter)) => {

4
artiq/firmware/satman/main.rs
View File

@ -260,8 +260,8 @@ pub extern fn main() -> i32 {
uart_logger::ConsoleLogger::register(); uart_logger::ConsoleLogger::register();
info!("ARTIQ satellite manager starting..."); info!("ARTIQ satellite manager starting...");
info!("software version {}", csr::CONFIG_IDENTIFIER_STR); info!("software ident {}", csr::CONFIG_IDENTIFIER_STR);
info!("gateware version {}", ident::read(&mut [0; 64])); info!("gateware ident {}", ident::read(&mut [0; 64]));
#[cfg(has_slave_fpga_cfg)] #[cfg(has_slave_fpga_cfg)]
board_artiq::slave_fpga::load().expect("cannot load RTM FPGA gateware"); board_artiq::slave_fpga::load().expect("cannot load RTM FPGA gateware");