cleanup dependencies and inter-dependent features

This commit is contained in:
bunnie 2025-03-04 01:28:38 +08:00
parent 4c16d42d45
commit 3be69cf8d1
3 changed files with 14 additions and 10 deletions

View file

@ -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"]

View file

@ -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" = []

View file

@ -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"