mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-15 08:30:02 +00:00
also move utralib change into kernel, update cargo.lock
This commit is contained in:
bunnie
parent
776a47f4bc
commit
d699ddf998
2 changed files with 42 additions and 48 deletions
81
Cargo.lock
generated
81
Cargo.lock
generated
|
|
@ -533,7 +533,7 @@ dependencies = [
|
|||
"susres",
|
||||
"ticktimer-server",
|
||||
"trng",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -554,7 +554,7 @@ dependencies = [
|
|||
"ticktimer-server",
|
||||
"trng",
|
||||
"typenum",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -927,7 +927,7 @@ dependencies = [
|
|||
"serde",
|
||||
"sha2-loader",
|
||||
"subtle",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
|
|
@ -1046,7 +1046,7 @@ dependencies = [
|
|||
"rkyv",
|
||||
"ticktimer-server",
|
||||
"trng",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1169,7 +1169,7 @@ dependencies = [
|
|||
"rkyv",
|
||||
"susres",
|
||||
"ticktimer-server",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1286,7 +1286,7 @@ dependencies = [
|
|||
"num-traits",
|
||||
"susres",
|
||||
"ticktimer-server",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-names",
|
||||
|
|
@ -1504,7 +1504,7 @@ dependencies = [
|
|||
"ticktimer-server",
|
||||
"trng",
|
||||
"tts-frontend",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1569,7 +1569,7 @@ dependencies = [
|
|||
"susres",
|
||||
"ticktimer-server",
|
||||
"trng",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1795,7 +1795,7 @@ dependencies = [
|
|||
"rkyv",
|
||||
"ticktimer-server",
|
||||
"tts-frontend",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1826,7 +1826,7 @@ dependencies = [
|
|||
"num-traits",
|
||||
"rkyv",
|
||||
"ticktimer-server",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1845,7 +1845,7 @@ dependencies = [
|
|||
"rkyv",
|
||||
"ticktimer-server",
|
||||
"tts-frontend",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1930,7 +1930,7 @@ dependencies = [
|
|||
"rkyv",
|
||||
"susres",
|
||||
"ticktimer-server",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1949,7 +1949,7 @@ version = "0.1.0"
|
|||
dependencies = [
|
||||
"log",
|
||||
"ticktimer-server",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
]
|
||||
|
|
@ -1966,7 +1966,7 @@ dependencies = [
|
|||
"spinor",
|
||||
"susres",
|
||||
"ticktimer-server",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -2021,7 +2021,7 @@ dependencies = [
|
|||
"num-derive",
|
||||
"num-traits",
|
||||
"ticktimer-server",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-names",
|
||||
|
|
@ -2040,7 +2040,7 @@ dependencies = [
|
|||
"rkyv",
|
||||
"susres",
|
||||
"ticktimer-server",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -2056,7 +2056,7 @@ dependencies = [
|
|||
"curve25519-dalek-loader",
|
||||
"ed25519-dalek-loader",
|
||||
"lazy_static",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -2097,7 +2097,7 @@ dependencies = [
|
|||
"log",
|
||||
"num-derive",
|
||||
"num-traits",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -2217,7 +2217,7 @@ dependencies = [
|
|||
"ticktimer-server",
|
||||
"trng",
|
||||
"tts-frontend",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -2258,7 +2258,7 @@ dependencies = [
|
|||
"susres",
|
||||
"ticktimer-server",
|
||||
"trng",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -2530,7 +2530,7 @@ dependencies = [
|
|||
"ticktimer-server",
|
||||
"trng",
|
||||
"tts-frontend",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -2561,7 +2561,7 @@ name = "perflib"
|
|||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"log",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
|
|
@ -3130,7 +3130,7 @@ dependencies = [
|
|||
"trng",
|
||||
"tts-frontend",
|
||||
"usb-device-xous",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -3399,7 +3399,7 @@ dependencies = [
|
|||
"susres",
|
||||
"ticktimer-server",
|
||||
"trng",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -3413,7 +3413,7 @@ dependencies = [
|
|||
"block-buffer 0.9.0",
|
||||
"digest 0.9.0",
|
||||
"opaque-debug",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -3479,7 +3479,7 @@ dependencies = [
|
|||
"tungstenite",
|
||||
"url",
|
||||
"usb-device-xous",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"webpki-roots",
|
||||
"x25519-dalek",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -3580,7 +3580,7 @@ dependencies = [
|
|||
"susres",
|
||||
"ticktimer-server",
|
||||
"trng",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -3644,7 +3644,7 @@ dependencies = [
|
|||
"ticktimer-server",
|
||||
"trng",
|
||||
"usb-device-xous",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -3678,7 +3678,7 @@ dependencies = [
|
|||
"num-derive",
|
||||
"num-traits",
|
||||
"rkyv",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -3832,7 +3832,7 @@ dependencies = [
|
|||
"num-traits",
|
||||
"rkyv",
|
||||
"susres",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -3982,7 +3982,7 @@ dependencies = [
|
|||
"rkyv",
|
||||
"susres",
|
||||
"ticktimer-server",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -3999,7 +3999,7 @@ dependencies = [
|
|||
"num-traits",
|
||||
"rkyv",
|
||||
"ticktimer-server",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -4150,7 +4150,7 @@ dependencies = [
|
|||
"ticktimer-server",
|
||||
"usb-device",
|
||||
"usbd-human-interface-device 0.2.1",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"vcell",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
|
|
@ -4175,7 +4175,7 @@ dependencies = [
|
|||
"ticktimer-server",
|
||||
"usb-device",
|
||||
"usbd-human-interface-device 0.1.1",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"vcell",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
|
|
@ -4222,13 +4222,6 @@ version = "0.7.6"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
|
||||
|
||||
[[package]]
|
||||
name = "utralib"
|
||||
version = "0.1.3"
|
||||
dependencies = [
|
||||
"svd2utra 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "utralib"
|
||||
version = "0.1.3"
|
||||
|
|
@ -4784,7 +4777,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "xous-kernel"
|
||||
version = "0.9.1"
|
||||
version = "0.9.2"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"crossbeam-channel",
|
||||
|
|
@ -4793,7 +4786,7 @@ dependencies = [
|
|||
"rand 0.7.3",
|
||||
"rand_chacha 0.3.1",
|
||||
"stats_alloc",
|
||||
"utralib 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-riscv",
|
||||
]
|
||||
|
|
@ -4806,7 +4799,7 @@ dependencies = [
|
|||
"num-derive",
|
||||
"num-traits",
|
||||
"rkyv",
|
||||
"utralib 0.1.3",
|
||||
"utralib",
|
||||
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"xous-api-log-server",
|
||||
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ description = "Core kernel for Xous, including task switching and memory managem
|
|||
license = "MIT OR Apache-2.0"
|
||||
edition = "2018"
|
||||
name = "xous-kernel"
|
||||
version = "0.9.1"
|
||||
version = "0.9.2"
|
||||
resolver = "2"
|
||||
|
||||
# Dependency versions enforced by Cargo.lock.
|
||||
|
|
@ -14,6 +14,7 @@ stats_alloc = { version = "0.1.8", optional = true }
|
|||
xous-kernel = { package = "xous", version = "0.9.9", features = [
|
||||
"forget-memory-messages",
|
||||
] }
|
||||
utralib = { version = "0.1.3", optional = true, default_features = false }
|
||||
|
||||
[target.'cfg(any(windows,unix))'.dev-dependencies]
|
||||
xous-kernel = { package = "xous", version = "0.9.9", features = [
|
||||
|
|
@ -21,13 +22,13 @@ xous-kernel = { package = "xous", version = "0.9.9", features = [
|
|||
"processes-as-threads",
|
||||
] }
|
||||
|
||||
[target.'cfg(not(any(windows, unix)))'.dependencies]
|
||||
utralib = { version = "0.1.3", default_features = false }
|
||||
|
||||
[target.'cfg(target_arch = "riscv32")'.dependencies]
|
||||
riscv = { version = "0.5.6", package = "xous-riscv" } # source is in "../imports/riscv-0.5.6"
|
||||
|
||||
[features]
|
||||
precursor = ["utralib/precursor"]
|
||||
hosted = ["utralib/hosted"]
|
||||
renode = ["utralib/renode"]
|
||||
debug-print = []
|
||||
gdb-stub = []
|
||||
print-panics = []
|
||||
|
|
|
|||
Loading…
Reference in a new issue