saymrwulf/xous-core
1
0
Fork 0
mirror of https://github.com/saymrwulf/xous-core.git synced 2026-11-15 08:30:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into trng-test

Browse source
This commit is contained in:
bunnie 2024-06-14 19:17:11 +08:00 committed by GitHub
commit 7743d96e91
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/vault/tools/vaultbackup-rs/Cargo.toml
View file

@ -10,7 +10,7 @@ argh = "0.1.8"
ctaphid = "0.1.1"
cbor = { path = "../../libraries/cbor" }
backup = { path = "../../libraries/backup" }
hidapi = { version = "1.4.1", default_features = false }
hidapi = { version = "1.4.1", default-features = false }
serde_json = "1.0.82"
serde = { version = "1.0.138", features = ["derive"] }
hex = "0.4.3"

6
kernel/Cargo.toml
View file

@ -14,9 +14,9 @@ stats_alloc = { version = "0.1.8", optional = true }
xous-kernel = { package = "xous", version = "0.9.62", features = [
"forget-memory-messages",
] }
utralib = { version = "0.1.24", optional = true, default_features = false }
rand_chacha = { version = "0.3.1", optional = true, default_features = false }
cramium-hal = { path = "../libs/cramium-hal", optional = true, default_features = false }
utralib = { version = "0.1.24", optional = true, default-features = false }
rand_chacha = { version = "0.3.1", optional = true, default-features = false }
cramium-hal = { path = "../libs/cramium-hal", optional = true, default-features = false }
loader = { path = "../loader", optional = true, features = ["swap"] }
[target.'cfg(any(windows,unix))'.dev-dependencies]

4
loader/Cargo.toml
View file

@ -17,7 +17,7 @@ utralib = { version = "0.1.24", optional = true, default-features = false }
armv7 = { git = "https://github.com/Foundation-Devices/armv7.git", branch = "update", optional = true }
atsama5d27 = { git = "https://github.com/Foundation-Devices/atsama5d27.git", branch = "master", optional = true }
sha2-loader = { path = "./sha2-loader", default-features = false, optional = true }
cramium-hal = { path = "../libs/cramium-hal", optional = true, default_features = false }
cramium-hal = { path = "../libs/cramium-hal", optional = true, default-features = false }
xous-pl230 = { path = "../libs/xous-pl230", optional = true, features = [
"tests",
"pio",
@ -33,7 +33,7 @@ aes-gcm-siv = { version = "0.11.1", default-features = false, features = [
"aes",
], optional = true }
crc = { version = "1.8.1", default-features = false }
rand_chacha = { version = "0.3.1", optional = true, default_features = false }
rand_chacha = { version = "0.3.1", optional = true, default-features = false }
pio-proc = { version = "0.2.2", optional = true }
pio = { version = "0.2.1", optional = true }
riscv = { version = "0.5.6", package = "xous-riscv" }

2
services/aes/Cargo.toml
View file

@ -8,7 +8,7 @@ description = "AES library for Xous"
# Dependency versions enforced by Cargo.lock.
[dependencies]
cipher = "0.4.2"
zeroize = { version = "1.6.0", optional = true, default_features = false }
zeroize = { version = "1.6.0", optional = true, default-features = false }
[features]
hazmat = [] # Expose cryptographically hazardous APIs

2
services/content-plugin-api/Cargo.toml
View file

@ -8,7 +8,7 @@ description = "Content Canvas Plugin Common APIs"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.62"
rkyv = { version = "0.4.3", default_features = false }
rkyv = { version = "0.4.3", default-features = false }
graphics-server = { path = "../graphics-server" } # this is used by the IMEF portion of the API
xous-names = { package = "xous-api-names", version = "0.9.60" } # used by the IMEF for registering listeners
log = "0.4.14"

2
services/gam/Cargo.toml
View file

@ -28,7 +28,7 @@ rkyv = { version = "0.4.3", default-features = false, features = [
] }
susres = { package = "xous-api-susres", version = "0.9.58", optional = true } # used for the sleep now menu item
cram-hal-service = { path = "../cram-hal-service", optional = true, default_features = false }
cram-hal-service = { path = "../cram-hal-service", optional = true, default-features = false }
enum_dispatch = "0.3.7" # used for trait-based dispatch off of multiple layout objects.
locales = { path = "../../locales" }

2
services/xous-swapper/Cargo.toml
View file

@ -21,7 +21,7 @@ loader = { path = "../../loader", features = ["swap"] }
aes-gcm-siv = { version = "0.11.1", default-features = false, features = [
"aes",
] }
cramium-hal = { path = "../../libs/cramium-hal", optional = true, default_features = false }
cramium-hal = { path = "../../libs/cramium-hal", optional = true, default-features = false }
utralib = { version = "0.1.24", optional = true, default-features = false }