Merge branch 'main' into vault2

This commit is contained in:
bunnie 2025-10-08 02:59:59 +08:00 committed by GitHub
commit 13cd4f14a1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 6 additions and 15 deletions

1
Cargo.lock generated
View file

@ -438,7 +438,6 @@ dependencies = [
"utralib 0.1.26",
"ux-api",
"xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-bio-bdma",
"xous-riscv",
]

View file

@ -13,7 +13,6 @@ bao1x-api = { path = "../../libs/bao1x-api", optional = true, default-features =
vexriscv = { version = "0.5.6", package = "xous-riscv" }
riscv = { version = "0.14.0", features = ["critical-section-single-hart"] }
linked_list_allocator = { version = "0.10.5", optional = true }
xous-bio-bdma = { path = "../../libs/xous-bio-bdma", optional = true, default-features = false }
critical-section = "1.2.0"
ux-api = { path = "../../libs/ux-api", optional = true, default-features = false }
simple-fatfs = { git = "https://github.com/betrusted-io/simple-fatfs.git", branch = "baosec", default-features = false }

View file

@ -32,10 +32,6 @@ pub unsafe fn init_usb() {
// setup the stack & controller
// irq_setup(); // this is already assumed to have been called by early_init()!
enable_irq(utralib::utra::irqarray1::IRQARRAY1_IRQ);
// for testing
enable_irq(utralib::utra::irqarray19::IRQARRAY19_IRQ);
let mut irqarray19 = utralib::CSR::new(utralib::utra::irqarray19::HW_IRQARRAY19_BASE as *mut u32);
irqarray19.wo(utralib::utra::irqarray19::EV_ENABLE, 0x80);
unsafe {
USB = Some(usb);

View file

@ -56,6 +56,7 @@ bao1x-bio = [
"xous-bio-bdma/baremetal",
"xous-bio-bdma/bao1x",
"xous-bio-bdma/tests",
"xous-bio-bdma/debug-print",
]
# selects features for EVB target (defaults to baosec)
bao1x-evb = []
@ -74,4 +75,4 @@ trng-debug = []
verbose-debug = []
verilator-only = []
default = ["bao1x-usb", "bao1x-trng"]
default = ["bao1x-usb", "bao1x-trng", "bao1x-bio"]

View file

@ -257,7 +257,7 @@ pub fn bdma_coincident_test(_args: &Vec<String>, seed: u32) -> usize {
passing += coincident_u32(&mut bio_ss, ifram_src, ifram_dst, seed + 0x500, "i0->i1");
println!("0->1");
println!("DMA coincident done.");
println!("DMA coincident done, passing {}/4", passing);
passing
}

View file

@ -22,10 +22,6 @@ pub unsafe fn init_usb() {
// install the interrupt handler
enable_irq(utralib::utra::irqarray1::IRQARRAY1_IRQ);
// for testing
enable_irq(utralib::utra::irqarray19::IRQARRAY19_IRQ);
let mut irqarray19 = utralib::CSR::new(utralib::utra::irqarray19::HW_IRQARRAY19_BASE as *mut u32);
irqarray19.wo(utralib::utra::irqarray19::EV_ENABLE, 0x80);
unsafe {
USB = Some(usb);

View file

@ -286,6 +286,7 @@ impl Repl {
+ 1;
crate::println!("--- Starting On-Demand BIO Test Suite ---");
crate::println!("** Debug output is on DUART, not console **");
// Local counter to replace `self.passing_tests` from the TestRunner
let mut passing_tests = 0;
@ -367,9 +368,8 @@ impl Repl {
}
}
"reset" => {
let mut rcurst = CSR::new(utra::sysctrl::HW_SYSCTRL_BASE as *mut u32);
rcurst.wo(utra::sysctrl::SFR_RCURST0, 0x55AA);
// rcurst.wo(utra::sysctrl::SFR_RCURST1, 0x55AA);
let mut csr = CSR::new(utra::sysctrl::HW_SYSCTRL_BASE as *mut u32);
csr.wo(utra::sysctrl::SFR_RCURST0, 0x0000_55aa);
}
#[cfg(feature = "bao1x")]
"clocks" => {