From 3be69cf8d15d65f8595749b0380512a81ff9df79 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 4 Mar 2025 01:28:38 +0800 Subject: [PATCH] cleanup dependencies and inter-dependent features --- services/bao-console/Cargo.toml | 6 ++++-- services/cram-console/Cargo.toml | 12 +++++++----- services/cram-hal-service/Cargo.toml | 6 +++--- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/services/bao-console/Cargo.toml b/services/bao-console/Cargo.toml index b5aeb2413..54f0400e5 100644 --- a/services/bao-console/Cargo.toml +++ b/services/bao-console/Cargo.toml @@ -18,8 +18,10 @@ cramium-hal = { path = "../../libs/cramium-hal", features = [ cramium-api = { path = "../../libs/cramium-api" } cram-hal-service = { path = "../cram-hal-service", optional = true } cramium-emu = { path = "../cramium-emu", optional = true } -usb-cramium = { path = "../usb-cramium" } -modals = { path = "../modals" } +usb-cramium = { path = "../usb-cramium", features = ["cramium-soc"] } +modals = { path = "../modals", default-features = false, features = [ + "cramium-soc", +] } [features] cramium-soc = ["utralib/cramium-soc"] diff --git a/services/cram-console/Cargo.toml b/services/cram-console/Cargo.toml index ab06c4980..355e60b4d 100644 --- a/services/cram-console/Cargo.toml +++ b/services/cram-console/Cargo.toml @@ -17,11 +17,10 @@ num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } # xous-pio = { path = "../../libs/xous-pio", optional = true } -xous-pl230 = { path = "../../libs/xous-pl230", optional = true } +# xous-pl230 = { path = "../../libs/xous-pl230", optional = true } # this is temporary, until we get GAM/modals pulled in ux-api = { path = "../../libs/ux-api" } modals = { path = "../modals", features = ["cramium-soc"] } -gam = { path = "../gam" } locales = { path = "../../locales" } usb-device-xous = { path = "../usb-device-xous", default-features = false, optional = true } cramium-hal = { path = "../../libs/cramium-hal", features = ["std"] } @@ -30,8 +29,11 @@ ime-plugin-shell = { path = "../ime-plugin-shell" } xous-swapper = { path = "../xous-swapper" } [features] -"cramium-fpga" = ["utralib/cramium-fpga", "xous-pl230/cramium-fpga"] -"cramium-soc" = ["utralib/cramium-soc", "xous-pl230/cramium-soc"] +"cramium-fpga" = ["utralib/cramium-fpga"] +"cramium-soc" = ["utralib/cramium-soc"] +"board-baosec" = ["modals/board-baosec"] +"hosted-baosec" = ["modals/hosted-baosec"] + "hwsim" = [] "shellperf" = [] "mass-storage" = [] @@ -39,7 +41,7 @@ xous-swapper = { path = "../xous-swapper" } "tts" = [] "early-ball" = [] # "pio-test" = ["xous-pio"] -"pl230-test" = ["xous-pl230"] +# "pl230-test" = ["xous-pl230"] "hwtest" = [] "pddb" = [] "gam" = [] diff --git a/services/cram-hal-service/Cargo.toml b/services/cram-hal-service/Cargo.toml index 2ff1207ee..f259059e5 100644 --- a/services/cram-hal-service/Cargo.toml +++ b/services/cram-hal-service/Cargo.toml @@ -23,12 +23,12 @@ cramium-api = { path = "../../libs/cramium-api", features = [ "derive-rkyv", "std", ] } -xous-pl230 = { path = "../../libs/xous-pl230", features = ["cramium-soc"] } +# xous-pl230 = { path = "../../libs/xous-pl230", features = ["cramium-soc"] } # xous-pio = { path = "../../libs/xous-pio", default-features = false, features = [ # "cramium-soc", # ] } -pio-proc = "0.2.2" -pio = "0.2.1" +# pio-proc = "0.2.2" +# pio = "0.2.1" rand_core = "0.6.4" rand_chacha = "0.3.1" bitfield = "0.13.2"