diff --git a/services/llio/src/api.rs b/services/llio/src/api.rs index 96704c419..9e613ff9f 100644 --- a/services/llio/src/api.rs +++ b/services/llio/src/api.rs @@ -1,6 +1,6 @@ /////////////////////// UART TYPE #[allow(dead_code)] // we actually use this constant, but clippy insists that we don't -pub(crate) const BOOT_UART: u32 = UartType::Kernel as u32; +pub(crate) const BOOT_UART: u32 = UartType::Log as u32; #[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, PartialEq, Eq)] pub enum UartType { diff --git a/services/root-keys/src/implementation.rs b/services/root-keys/src/implementation.rs index b8ee4a426..de7db329e 100644 --- a/services/root-keys/src/implementation.rs +++ b/services/root-keys/src/implementation.rs @@ -400,7 +400,7 @@ pub(crate) struct RootKeys { spinor: spinor::Spinor, ticktimer: ticktimer_server::Ticktimer, xns: xous_names::XousNames, - //jtag: jtag::Jtag, + jtag: jtag::Jtag, } impl<'a> RootKeys { @@ -455,7 +455,7 @@ impl<'a> RootKeys { let spinor = spinor::Spinor::new(&xns).expect("couldn't connect to spinor server"); spinor.register_soc_token().expect("couldn't register rootkeys as the one authorized writer to the gateware update area!"); - //let jtag = jtag::Jtag::new(&xns).expect("couldn't connect to JTAG server"); + let jtag = jtag::Jtag::new(&xns).expect("couldn't connect to JTAG server"); let keys = RootKeys { keyrom: CSR::new(keyrom.as_mut_ptr() as *mut u32), @@ -478,7 +478,7 @@ impl<'a> RootKeys { spinor, ticktimer: ticktimer_server::Ticktimer::new().expect("couldn't connect to ticktimer"), xns, - //jtag, + jtag, }; keys diff --git a/services/shellchat/src/cmds.rs b/services/shellchat/src/cmds.rs index 1f6a55f0f..7642a8042 100644 --- a/services/shellchat/src/cmds.rs +++ b/services/shellchat/src/cmds.rs @@ -97,7 +97,7 @@ mod engine; use engine::*; mod console; use console::*; mod memtest; use memtest::*; mod keys; use keys::*; -//mod jtag_cmd; use jtag_cmd::*; +mod jtag_cmd; use jtag_cmd::*; //mod fcc; use fcc::*; //mod pds; // dependency of the FCC file @@ -122,7 +122,7 @@ pub struct CmdEnv { engine_cmd: Engine, memtest_cmd: Memtest, keys_cmd: Keys, - //jtag_cmd: JtagCmd, + jtag_cmd: JtagCmd, //fcc_cmd: Fcc, } @@ -174,7 +174,7 @@ impl CmdEnv { engine_cmd: engine, memtest_cmd: memtest, keys_cmd: Keys::new(&xns), - //jtag_cmd: JtagCmd::new(&xns), + jtag_cmd: JtagCmd::new(&xns), //fcc_cmd: fcc, } @@ -210,7 +210,7 @@ impl CmdEnv { &mut console_cmd, &mut self.memtest_cmd, &mut self.keys_cmd, - //&mut self.jtag_cmd, + &mut self.jtag_cmd, //&mut self.fcc_cmd, ]; diff --git a/xtask/src/main.rs b/xtask/src/main.rs index f76575a1a..803f3bbb4 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -51,7 +51,7 @@ fn main() -> Result<(), Box> { "engine-25519", "spinor", "root-keys", - //"jtag", + "jtag", ]; let benchmark_pkgs = [ "benchmark",