From d3eda68b4226337419588c0b7c9fc6a82e0ac734 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sat, 30 Nov 2024 02:23:35 +0800 Subject: [PATCH] move features from cramium-soc into specific boards cramium-soc is moving closer to the platonic SoC specifier, and the board-* features are for the specific boards that use cramium-soc This division of feature flags feels a lot nicer and cleaner - if it holds up to further development, I think this style might become the new standard for Xous (as opposed to a single level of feature flag where both SoC and board target are conflated in terms of meaning - which kind of made sense when the CPU was an FPGA and could actually have different features for different boards, but for ASICs this wouldn't happen). --- loader/Cargo.toml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/loader/Cargo.toml b/loader/Cargo.toml index 26a27b24e..5cd382dfc 100644 --- a/loader/Cargo.toml +++ b/loader/Cargo.toml @@ -79,29 +79,25 @@ renode = [ cramium-soc = [ "utralib/cramium-soc", "debug-print", - "simulation-only", "cramium-hal", - "xous-pio", - "xous-pl230", "rand_chacha", "sram-margin", + # "boot-delay", +] +board-baosec = [ + "cramium-hal/board-baosec", + "updates", + "usb", "libm", "simple-fatfs", "linked_list_allocator", "ed25519-dalek", "sha2", "digest", - # "boot-delay", ] -board-baosec = ["cramium-hal/board-baosec"] board-baosor = ["cramium-hal/board-baosor"] board-dabao = ["cramium-hal/board-dabao"] -cramium-fpga = [ - "utralib/cramium-fpga", - "debug-print", - "simulation-only", - "cramium-hal", -] +cramium-fpga = ["utralib/cramium-fpga", "debug-print", "cramium-hal"] atsama5d27 = ["utralib/atsama5d27", "armv7", "dep:atsama5d27"] # precursor flags @@ -118,6 +114,7 @@ board-bringup = [] sram-margin = [] boot-delay = [] simulation-only = [] +verilator-only = [] quantum-timer-test = ["pio", "pio-proc"] spim-test = [] irq-test = [] @@ -129,10 +126,11 @@ clock-tests = [] reset-debug = [] usb = [] qr = ["nalgebra"] +updates = [] # general flags debug-print = [] earlyprintk = [] resume = [] # suspend/resume pathway code -default = ["board-bringup", "dump-trng", "usb"] +default = []