From ad38080484eff240022917414839194d97b1abe9 Mon Sep 17 00:00:00 2001 From: bunnie Date: Thu, 11 Sep 2025 00:55:01 +0800 Subject: [PATCH] refactor dependencies to allow for critical_section in loader --- loader/Cargo.toml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/loader/Cargo.toml b/loader/Cargo.toml index 1c802d163..0d0df707f 100644 --- a/loader/Cargo.toml +++ b/loader/Cargo.toml @@ -41,7 +41,7 @@ crc = { version = "1.8.1", default-features = false } rand_chacha = { version = "0.3.1", optional = true, default-features = false } pio-proc = { version = "0.2.2", optional = true } pio = { version = "0.2.1", optional = true } -riscv = { version = "0.5.6", package = "xous-riscv" } +vexriscv = { version = "0.5.6", package = "xous-riscv" } libm = { version = "0.2.8", optional = true } nalgebra = { version = "0.33", default-features = false, features = [ "libm", @@ -50,6 +50,8 @@ simple-fatfs = { git = "https://github.com/betrusted-io/simple-fatfs.git", branc linked_list_allocator = { version = "0.10.5", optional = true } sha2 = { version = "0.10.8", optional = true, default-features = false } digest = { version = "0.10.7", optional = true } +critical-section = { version = "1.2.0", optional = true } +riscv = { version = "0.14.0", features = ["critical-section-single-hart"] } [dependencies.ed25519-dalek] version = "=2.1.0" @@ -135,7 +137,7 @@ fast-fclk = [] clock-tests = [] reset-debug = [] cam-test = ["nalgebra", "libm", "cramium-hal/debug-print-usb"] -usb = [] +usb = ["critical-section"] qr = ["nalgebra", "libm"] updates = [] cramium-mpw = ["cramium-hal/mpw"] @@ -147,4 +149,4 @@ debug-print = [] early-printk = [] resume = [] # suspend/resume pathway code -default = [] +default = ["usb"]