From 13984385a8c47f7cce1b7d449767dbe478d36340 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sun, 15 Jul 2018 17:40:17 +0800 Subject: [PATCH] =?UTF-8?q?firmware:=20version=20=E2=86=92=20ident?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- artiq/firmware/runtime/main.rs | 4 ++-- artiq/firmware/satman/main.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/artiq/firmware/runtime/main.rs b/artiq/firmware/runtime/main.rs index 26368104e..b1615753c 100644 --- a/artiq/firmware/runtime/main.rs +++ b/artiq/firmware/runtime/main.rs @@ -66,8 +66,8 @@ fn startup() { irq::set_ie(true); clock::init(); info!("ARTIQ runtime starting..."); - info!("software version {}", csr::CONFIG_IDENTIFIER_STR); - info!("gateware version {}", ident::read(&mut [0; 64])); + info!("software ident {}", csr::CONFIG_IDENTIFIER_STR); + info!("gateware ident {}", ident::read(&mut [0; 64])); match config::read_str("log_level", |r| r.map(|s| s.parse())) { Ok(Ok(log_level_filter)) => { diff --git a/artiq/firmware/satman/main.rs b/artiq/firmware/satman/main.rs index d74d0480d..f1b94849d 100644 --- a/artiq/firmware/satman/main.rs +++ b/artiq/firmware/satman/main.rs @@ -260,8 +260,8 @@ pub extern fn main() -> i32 { uart_logger::ConsoleLogger::register(); info!("ARTIQ satellite manager starting..."); - info!("software version {}", csr::CONFIG_IDENTIFIER_STR); - info!("gateware version {}", ident::read(&mut [0; 64])); + info!("software ident {}", csr::CONFIG_IDENTIFIER_STR); + info!("gateware ident {}", ident::read(&mut [0; 64])); #[cfg(has_slave_fpga_cfg)] board_artiq::slave_fpga::load().expect("cannot load RTM FPGA gateware");