From 6c9edc26a3b19b1ae4d426aaa46315364dd5845a Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 20 May 2025 14:39:47 +0800 Subject: [PATCH] cleanup some of the HAL dependencies in PDDB still have some...mysterious...problems around feature flags that aren't being invoked when i think they should be. but let's commit this checkpoint because I suspect I may need to roll back to here several times and I try to figure out the root cause of the issues. --- services/pddb/Cargo.toml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/services/pddb/Cargo.toml b/services/pddb/Cargo.toml index 0e39a6681..7879d7eee 100644 --- a/services/pddb/Cargo.toml +++ b/services/pddb/Cargo.toml @@ -70,13 +70,11 @@ hex = { version = "0.4.3", default-features = false, features = [ ], optional = true } # Gen-2 dependencies -keystore = { path = "../keystore", optional = true } # contains all key handlers -xous-swapper = { path = "../xous-swapper", optional = true } # contains spinor +keystore = { path = "../keystore", optional = true } # contains all key handlers +xous-swapper = { path = "../xous-swapper", optional = true } # contains spinor cram-hal-service = { path = "../cram-hal-service", optional = true } -cramium-emu = { path = "../cramium-emu", optional = true } -cramium-hal = { path = "../../libs/cramium-hal", features = [ - "std", -], optional = true } +cramium-emu = { path = "../cramium-emu", optional = true, default-features = false } +cramium-hal = { path = "../../libs/cramium-hal", optional = true } [features] gen1 = [ @@ -101,9 +99,10 @@ renode = ["utralib/renode", "sha2/renode", "gen1"] board-baosec = [ "gen2", "xous-swapper/board-baosec", - "cram-hal-service", + "cram-hal-service/board-baosec", "cramium-hal/board-baosec", "modals/board-baosec", + "keystore/board-baosec", ] # USB form factor token hosted-baosec = [ "gen2", @@ -114,8 +113,9 @@ hosted-baosec = [ board-baosor = [ "gen2", "xous-swapper/board-baosor", - "cram-hal-service", - "cramium-hal", + "cram-hal-service/board-baosor", + "cramium-hal/board-baosor", + "keystore/board-baosor", ] # Precursor form factor # board-dabao is not a valid target as it lacks external SPI flash