mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
jtag server now reporting ID
This commit is contained in:
parent
bdd70f9502
commit
35e7cfe89e
4 changed files with 9 additions and 9 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
/////////////////////// UART TYPE
|
/////////////////////// UART TYPE
|
||||||
#[allow(dead_code)] // we actually use this constant, but clippy insists that we don't
|
#[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)]
|
#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, PartialEq, Eq)]
|
||||||
pub enum UartType {
|
pub enum UartType {
|
||||||
|
|
|
||||||
|
|
@ -400,7 +400,7 @@ pub(crate) struct RootKeys {
|
||||||
spinor: spinor::Spinor,
|
spinor: spinor::Spinor,
|
||||||
ticktimer: ticktimer_server::Ticktimer,
|
ticktimer: ticktimer_server::Ticktimer,
|
||||||
xns: xous_names::XousNames,
|
xns: xous_names::XousNames,
|
||||||
//jtag: jtag::Jtag,
|
jtag: jtag::Jtag,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> RootKeys {
|
impl<'a> RootKeys {
|
||||||
|
|
@ -455,7 +455,7 @@ impl<'a> RootKeys {
|
||||||
|
|
||||||
let spinor = spinor::Spinor::new(&xns).expect("couldn't connect to spinor server");
|
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!");
|
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 {
|
let keys = RootKeys {
|
||||||
keyrom: CSR::new(keyrom.as_mut_ptr() as *mut u32),
|
keyrom: CSR::new(keyrom.as_mut_ptr() as *mut u32),
|
||||||
|
|
@ -478,7 +478,7 @@ impl<'a> RootKeys {
|
||||||
spinor,
|
spinor,
|
||||||
ticktimer: ticktimer_server::Ticktimer::new().expect("couldn't connect to ticktimer"),
|
ticktimer: ticktimer_server::Ticktimer::new().expect("couldn't connect to ticktimer"),
|
||||||
xns,
|
xns,
|
||||||
//jtag,
|
jtag,
|
||||||
};
|
};
|
||||||
|
|
||||||
keys
|
keys
|
||||||
|
|
|
||||||
|
|
@ -97,7 +97,7 @@ mod engine; use engine::*;
|
||||||
mod console; use console::*;
|
mod console; use console::*;
|
||||||
mod memtest; use memtest::*;
|
mod memtest; use memtest::*;
|
||||||
mod keys; use keys::*;
|
mod keys; use keys::*;
|
||||||
//mod jtag_cmd; use jtag_cmd::*;
|
mod jtag_cmd; use jtag_cmd::*;
|
||||||
|
|
||||||
//mod fcc; use fcc::*;
|
//mod fcc; use fcc::*;
|
||||||
//mod pds; // dependency of the FCC file
|
//mod pds; // dependency of the FCC file
|
||||||
|
|
@ -122,7 +122,7 @@ pub struct CmdEnv {
|
||||||
engine_cmd: Engine,
|
engine_cmd: Engine,
|
||||||
memtest_cmd: Memtest,
|
memtest_cmd: Memtest,
|
||||||
keys_cmd: Keys,
|
keys_cmd: Keys,
|
||||||
//jtag_cmd: JtagCmd,
|
jtag_cmd: JtagCmd,
|
||||||
|
|
||||||
//fcc_cmd: Fcc,
|
//fcc_cmd: Fcc,
|
||||||
}
|
}
|
||||||
|
|
@ -174,7 +174,7 @@ impl CmdEnv {
|
||||||
engine_cmd: engine,
|
engine_cmd: engine,
|
||||||
memtest_cmd: memtest,
|
memtest_cmd: memtest,
|
||||||
keys_cmd: Keys::new(&xns),
|
keys_cmd: Keys::new(&xns),
|
||||||
//jtag_cmd: JtagCmd::new(&xns),
|
jtag_cmd: JtagCmd::new(&xns),
|
||||||
|
|
||||||
//fcc_cmd: fcc,
|
//fcc_cmd: fcc,
|
||||||
}
|
}
|
||||||
|
|
@ -210,7 +210,7 @@ impl CmdEnv {
|
||||||
&mut console_cmd,
|
&mut console_cmd,
|
||||||
&mut self.memtest_cmd,
|
&mut self.memtest_cmd,
|
||||||
&mut self.keys_cmd,
|
&mut self.keys_cmd,
|
||||||
//&mut self.jtag_cmd,
|
&mut self.jtag_cmd,
|
||||||
|
|
||||||
//&mut self.fcc_cmd,
|
//&mut self.fcc_cmd,
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
"engine-25519",
|
"engine-25519",
|
||||||
"spinor",
|
"spinor",
|
||||||
"root-keys",
|
"root-keys",
|
||||||
//"jtag",
|
"jtag",
|
||||||
];
|
];
|
||||||
let benchmark_pkgs = [
|
let benchmark_pkgs = [
|
||||||
"benchmark",
|
"benchmark",
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue