diff --git a/loader/Cargo.toml b/loader/Cargo.toml index 02ced4473..12410260d 100644 --- a/loader/Cargo.toml +++ b/loader/Cargo.toml @@ -51,7 +51,7 @@ nalgebra = { version = "0.33", default-features = false, features = [ "libm", ], optional = true } simple-fatfs = { git = "https://github.com/betrusted-io/simple-fatfs.git", branch = "baosec", optional = true, default-features = false } -linked_list_allocator = { version = "0.10.5", optional = true } +linked_list_allocator = { version = "0.10.5" } 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 } @@ -95,26 +95,18 @@ bao1x = [ "bao1x-hal", "bao1x-api", "rand_chacha", - "sram-margin", # "boot-delay", ] board-baosec = [ "bao1x-hal/loader-baosec", - "updates", - "usb", "simple-fatfs", - "linked_list_allocator", "ed25519-dalek-bao1x", "sha2-bao1x", "digest", "ux-api/loader-baosec", ] board-baosor = ["bao1x-hal/loader-baosor"] -board-dabao = [ - "bao1x-hal/loader-dabao", - "bao1x-hal/board-dabao", - "linked_list_allocator", -] +board-dabao = ["bao1x-hal/loader-dabao", "bao1x-hal/board-dabao"] atsama5d27 = ["utralib/atsama5d27", "armv7", "dep:atsama5d27"] # precursor flags @@ -129,31 +121,19 @@ swap = ["dep:aes-gcm-siv"] # bao1x target flags board-bringup = [] -sh1107-bringup = [] # used to discover FB parameters -sram-margin = [] -boot-delay = [] simulation-only = [] verilator-only = [] -quantum-timer-test = ["pio", "pio-proc"] spim-test = [] irq-test = [] -usb-test = [] -trng-test = [] -dump-trng = [] fast-fclk = [] clock-tests = [] reset-debug = [] -cam-test = ["nalgebra", "libm", "bao1x-hal/debug-print-usb"] -usb = ["critical-section"] -qr = ["nalgebra", "libm"] -updates = [] bao1x-mpw = ["bao1x-hal/mpw"] -userspace-swap-debug = [] # sets up app UART mapping. -always-update = [] # always go into update mode, for fast dev loops +userspace-swap-debug = [] # sets up app UART mapping. # general flags debug-print = [] early-printk = [] resume = [] # suspend/resume pathway code -default = ["usb"] +default = [] diff --git a/xtask/src/main.rs b/xtask/src/main.rs index c9d295cc3..9a9c6ed10 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -708,10 +708,6 @@ fn main() -> Result<(), Box> { // builder.add_kernel_feature("debug-swap-verbose"); // builder.add_feature("quantum-timer"); // this isn't in bao1x.. builder.add_kernel_feature("v2p"); - builder.add_loader_feature("sram-margin"); - builder.add_loader_feature("usb"); - builder.add_loader_feature("updates"); - // builder.add_loader_feature("cam-test"); match task.as_deref() { Some("baosec") => builder.target_bao1x_soc(), _ => panic!("should be unreachable"),