diff --git a/Cargo.lock b/Cargo.lock index bf8e7c401..6ad56cb04 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -31,7 +31,7 @@ dependencies = [ "cipher 0.4.3", "hex-literal", "log", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", ] @@ -65,7 +65,7 @@ version = "0.1.0" dependencies = [ "hex-literal", "log", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", ] @@ -122,6 +122,14 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47253b98986dafc7a3e1cf3259194f1f47ac61abb57a57f46ec09e48d004ecda" +[[package]] +name = "armv7" +version = "0.2.1" +source = "git+https://github.com/Foundation-Devices/armv7.git?branch=update#d81db3c1bbdbb8a99ef41f19ff8fcab2912d831b" +dependencies = [ + "tock-registers", +] + [[package]] name = "arrayref" version = "0.3.6" @@ -137,6 +145,16 @@ dependencies = [ "critical-section", ] +[[package]] +name = "atsama5d27" +version = "0.1.0" +source = "git+ssh://git@github.com/Foundation-Devices/atsama5d27.git?branch=master#e1aa56367623c4497e3cfeec162a5728d69e5a08" +dependencies = [ + "armv7", + "r0", + "utralib 0.1.3", +] + [[package]] name = "atty" version = "0.2.14" @@ -175,11 +193,11 @@ dependencies = [ "num-derive", "num-traits", "trng", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -562,13 +580,13 @@ dependencies = [ "num-traits", "rkyv", "trng", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -583,13 +601,13 @@ dependencies = [ "rkyv", "trng", "typenum", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -642,7 +660,7 @@ dependencies = [ "graphics-server", "log", "rkyv", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", ] @@ -962,7 +980,7 @@ dependencies = [ "serde", "sha2-loader", "subtle", - "utralib", + "utralib 0.1.14", "zeroize", ] @@ -1080,12 +1098,12 @@ dependencies = [ "num-traits", "rkyv", "trng", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1208,13 +1226,13 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1325,8 +1343,8 @@ dependencies = [ "log", "num-derive", "num-traits", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", @@ -1534,13 +1552,13 @@ dependencies = [ "sha2", "trng", "tts-frontend", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1577,9 +1595,9 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", "wasm-bindgen-test", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1610,13 +1628,13 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1701,10 +1719,10 @@ dependencies = [ "num-derive", "num-traits", "tts-frontend", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1837,12 +1855,12 @@ dependencies = [ "num-traits", "rkyv", "tts-frontend", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1854,9 +1872,9 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1868,12 +1886,12 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1887,12 +1905,12 @@ dependencies = [ "num-traits", "rkyv", "tts-frontend", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1977,13 +1995,13 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1997,8 +2015,8 @@ name = "kernel-test" version = "0.1.0" dependencies = [ "log", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-ticktimer", ] @@ -2013,13 +2031,13 @@ dependencies = [ "num-traits", "rkyv", "spinor", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2063,8 +2081,8 @@ dependencies = [ "net", "num-derive", "num-traits", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", @@ -2081,13 +2099,13 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -2095,11 +2113,13 @@ dependencies = [ name = "loader" version = "0.1.0" dependencies = [ + "armv7", + "atsama5d27", "com_rs 0.1.0 (git+https://github.com/betrusted-io/com_rs?branch=main)", "curve25519-dalek-loader", "ed25519-dalek-loader", "lazy_static", - "utralib", + "utralib 0.1.14", ] [[package]] @@ -2236,12 +2256,12 @@ dependencies = [ "rkyv", "trng", "tts-frontend", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2268,11 +2288,11 @@ dependencies = [ "status", "trng", "ureq", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2307,13 +2327,13 @@ dependencies = [ "rkyv", "smoltcp", "trng", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -2620,13 +2640,13 @@ dependencies = [ "subtle", "trng", "tts-frontend", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "zeroize", "zeroize_derive", ] @@ -2653,8 +2673,8 @@ name = "perflib" version = "0.1.0" dependencies = [ "log", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2906,6 +2926,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "r0" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7a31eed1591dcbc95d92ad7161908e72f4677f8fabf2a32ca49b4237cbf211" + [[package]] name = "radium" version = "0.6.2" @@ -3116,11 +3142,11 @@ dependencies = [ "num-derive", "num-traits", "trng", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3158,9 +3184,9 @@ dependencies = [ "spin 0.5.2", "untrusted", "winapi", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3241,13 +3267,13 @@ dependencies = [ "trng", "tts-frontend", "usb-device-xous", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", "zeroize", ] @@ -3516,13 +3542,13 @@ dependencies = [ "opaque-debug", "rkyv", "trng", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3532,7 +3558,7 @@ dependencies = [ "block-buffer 0.9.0", "digest 0.9.0", "opaque-debug", - "utralib", + "utralib 0.1.14", ] [[package]] @@ -3598,15 +3624,15 @@ dependencies = [ "tungstenite", "url", "usb-device-xous", - "utralib", + "utralib 0.1.14", "webpki-roots", "x25519-dalek", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3657,7 +3683,7 @@ dependencies = [ name = "spawn" version = "0.1.0" dependencies = [ - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3688,13 +3714,13 @@ dependencies = [ "rand 0.7.3", "rkyv", "trng", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3748,13 +3774,13 @@ dependencies = [ "trng", "usb-device-xous", "userprefs", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -3786,7 +3812,8 @@ dependencies = [ [[package]] name = "svd2utra" -version = "0.1.13" +version = "0.1.11" +source = "git+https://github.com/Foundation-Devices/keyOS.git?branch=arm-keyos#41585ccbed94773095c11fa2ca61ee8aa325215d" dependencies = [ "convert_case", "quick-xml", @@ -3794,9 +3821,17 @@ dependencies = [ [[package]] name = "svd2utra" -version = "0.1.13" +version = "0.1.12" +dependencies = [ + "convert_case", + "quick-xml", +] + +[[package]] +name = "svd2utra" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4c9cee7701453535677289fac10ee40ab105ca501f80b81962174c5226cdd6" +checksum = "b8ca91e893df88447142ef08764cefa3488da48d331e005be41fceb127212a1a" dependencies = [ "convert_case", "quick-xml", @@ -3858,7 +3893,7 @@ dependencies = [ name = "test-spawn" version = "0.1.0" dependencies = [ - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3950,6 +3985,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +[[package]] +name = "tock-registers" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c" + [[package]] name = "toml" version = "0.5.9" @@ -3971,7 +4012,7 @@ dependencies = [ "log", "pem", "ring", - "svd2utra 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "svd2utra 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "xmas-elf", "xous-semver", ] @@ -4054,10 +4095,10 @@ dependencies = [ "num-derive", "num-traits", "usb-device-xous", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4071,13 +4112,13 @@ dependencies = [ "rand_chacha 0.3.1", "rand_core 0.5.1", "rkyv", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4089,12 +4130,12 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-tts-backend", ] @@ -4252,14 +4293,14 @@ dependencies = [ "usbd-human-interface-device 0.2.1", "usbd_mass_storage 0.1.0", "usbd_scsi 0.1.1", - "utralib", + "utralib 0.1.14", "vcell", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -4277,9 +4318,9 @@ dependencies = [ "rand_chacha 0.3.1", "usb-device", "usbd-human-interface-device 0.1.1", - "utralib", + "utralib 0.1.14", "vcell", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", @@ -4331,7 +4372,7 @@ dependencies = [ "typenum", "usb-device", "usbd_mass_storage 0.1.0", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-ticktimer", ] @@ -4405,7 +4446,7 @@ dependencies = [ "usb-device", "usbd_bulk_only_transport 0.1.0", "usbd_mass_storage 0.1.0", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-ticktimer", ] @@ -4428,11 +4469,19 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "utralib" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cc32203e2f81b6b8133a644d61def05387e2385d653cb1e923a65d5eee5f864" +version = "0.1.3" +source = "git+https://github.com/Foundation-Devices/keyOS.git?branch=arm-keyos#41585ccbed94773095c11fa2ca61ee8aa325215d" dependencies = [ - "svd2utra 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "svd2utra 0.1.11", +] + +[[package]] +name = "utralib" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34efe2bb324605e6aa837140fd1e9b5684bac3c64696af46aef94404a6bd5de4" +dependencies = [ + "svd2utra 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4485,13 +4534,13 @@ dependencies = [ "tts-frontend", "usb-device-xous", "usbd-human-interface-device 0.2.1", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4942,7 +4991,7 @@ checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" [[package]] name = "xous" -version = "0.9.35" +version = "0.9.34" dependencies = [ "compiler_builtins", "lazy_static", @@ -4951,99 +5000,99 @@ dependencies = [ [[package]] name = "xous" -version = "0.9.35" +version = "0.9.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73bab33f6209a2d60b301e4dcbbfc4a9b82e24646dacbbe38dfcea9210d56ea2" +checksum = "82b8e8406574f40ee7504b5aef1ef19d3c0ec10dec6603ea5c1a68544b75314a" dependencies = [ "lazy_static", ] [[package]] name = "xous-api-log" -version = "0.1.30" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4e72aa118f5e70487c4309ec3a8299120c6a9cece3f6028c2c1f33b928bf15" +checksum = "c7632707c6e59888a5511bc671b65e493693ee18db915a5f450e6445a2988824" dependencies = [ "log", "num-derive", "num-traits", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-api-names" -version = "0.9.32" +version = "0.9.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d083c96801632fd764bfd2b56d681b038e8651c9c23f9b606c341cd98219f66" +checksum = "7b27015581bfcac09a5e555e66aefddaafddef54c8162a1aa5a6523ebe213259" dependencies = [ "log", "num-derive", "num-traits", "rkyv", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-api-susres" -version = "0.9.30" +version = "0.9.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f32625fcafea6d397532244eaf6972d8777f0fb7da0f6dc961888b55d25a295" +checksum = "b4388a141859e4c46ee3447101da9a33ee346ff70ba65027bcdd73d3fa5cd3d6" dependencies = [ "log", "num-derive", "num-traits", "rkyv", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-api-ticktimer" -version = "0.9.30" +version = "0.9.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c359799fa1c7d5ab65435ca8c2a7fed37cdc8e2d4313d6684db0f42902ec46" +checksum = "d8fb9dd1765f68961853f9d0efe9cc675f288b6bf9fba421ba17cbffcec788f3" dependencies = [ "log", "num-derive", "num-traits", "rkyv", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] [[package]] name = "xous-ipc" -version = "0.9.35" +version = "0.9.34" dependencies = [ "bitflags", "rkyv", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-ipc" -version = "0.9.35" +version = "0.9.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348abb74f628f0e6378f899d387522acb0cf2a515fc1956bf0c3ec01911766fd" +checksum = "b0cbe69c936de1ad128023d001ac7fb9f84423dd0bec3ff1c2f34153e72cb61e" dependencies = [ "bitflags", "rkyv", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-kernel" -version = "0.9.37" +version = "0.9.36" dependencies = [ "bitflags", "crossbeam-channel", @@ -5052,37 +5101,37 @@ dependencies = [ "rand 0.7.3", "rand_chacha 0.3.1", "stats_alloc", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-riscv", ] [[package]] name = "xous-log" -version = "0.1.27" +version = "0.1.26" dependencies = [ "log", "num-derive", "num-traits", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-names" -version = "0.9.36" +version = "0.9.35" dependencies = [ "log", "num-derive", "num-traits", "rkyv", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5103,35 +5152,35 @@ checksum = "6ed3278bb4e7be4895c1c597434e5269f7357ffb800ebc644f0398bb008a15ad" [[package]] name = "xous-susres" -version = "0.1.35" +version = "0.1.34" dependencies = [ "log", "num-derive", "num-traits", "rkyv", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-ticktimer" -version = "0.1.31" +version = "0.1.30" dependencies = [ "log", "num-derive", "num-traits", "rkyv", - "utralib", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.14", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -5145,9 +5194,9 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "xous 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", - "xous-ipc 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5161,7 +5210,7 @@ dependencies = [ "rustc_version 0.4.0", "serde", "serde_json", - "svd2utra 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "svd2utra 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile", "ureq", "zip", diff --git a/loader/Cargo.toml b/loader/Cargo.toml index e7f3f1a43..10f8261fe 100644 --- a/loader/Cargo.toml +++ b/loader/Cargo.toml @@ -6,9 +6,11 @@ edition = "2018" description = "Initial kernel loader for Xous" [dependencies] -ed25519-dalek-loader = { path = "ed25519-dalek-loader", default-features = false } -curve25519-dalek-loader = { path = "curve25519-dalek-loader", default-features = false, features = ["u32e_backend"] } +ed25519-dalek-loader = { path = "ed25519-dalek-loader", default-features = false, optional = true } +curve25519-dalek-loader = { path = "curve25519-dalek-loader", default-features = false, features = ["u32e_backend"], optional = true } utralib = { version = "0.1.15", optional = true, default-features = false } +armv7 = { git = "https://github.com/Foundation-Devices/armv7.git", branch = "update", optional = true } +atsama5d27 = { git = "ssh://git@github.com/Foundation-Devices/atsama5d27.git", branch = "master", optional = true } [dependencies.com_rs] git = "https://github.com/betrusted-io/com_rs" @@ -22,6 +24,7 @@ precursor = ["utralib/precursor", "ed25519-dalek-loader/precursor", "curve25519- renode = ["utralib/renode", "ed25519-dalek-loader/renode", "curve25519-dalek-loader/renode", "resume", "secboot"] cramium-soc = ["utralib/cramium-soc"] cramium-fpga = ["utralib/cramium-fpga"] +atsama5d27 = ["utralib/atsama5d27", "armv7", "dep:atsama5d27"] platform-tests = [] debug-print = [] earlyprintk = []