saymrwulf/xous-core
1
0
Fork 0
mirror of https://github.com/saymrwulf/xous-core.git synced 2026-11-08 04:56:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
xous-core/Cargo.toml

180 lines
4.9 KiB
TOML
Raw Normal View History

core: add Workspace back in The Workspace turns out to be useful, particularly when handled correctly. This allows for a unification of all packages. Additionally, since we now are focusing on applications and servers now, the decision of which packages to build by default becomes clearer. Finally, we'll be able to use `xbuild` to construct more complex workflows with a full Workspace. Signed-off-by: Sean Cross <sean@xobs.io>
2020-08-17 10:39:33 +00:00
[workspace]
examples: append `-server` to server names This keeps server names such as "log" and "graphics" as unambiguous. Signed-off-by: Sean Cross <sean@xobs.io>
2020-08-17 11:41:50 +00:00
default-members = [
cross-repo update versions from xous-rs bump
2022-10-05 10:32:44 +00:00
"services/xous-log",
"services/xous-ticktimer",
ipc: convert project to use `xous-ipc` This rewrites the entire project so that most runnable projects now use `xous-ipc` instead of `xous::String` where possible. This also removes `rkyv` from the list of dependencies in `xous-rs`. Signed-off-by: Sean Cross <sean@xobs.io>
2021-03-26 12:22:33 +00:00
"services/xous-names",
cross-repo update versions from xous-rs bump
2022-10-05 10:32:44 +00:00
"services/xous-susres",
"services/graphics-server",
ipc: convert project to use `xous-ipc` This rewrites the entire project so that most runnable projects now use `xous-ipc` instead of `xous::String` where possible. This also removes `rkyv` from the list of dependencies in `xous-rs`. Signed-off-by: Sean Cross <sean@xobs.io>
2021-03-26 12:22:33 +00:00
"services/keyboard",
"services/com",
"services/trng",
"services/gam",
extend modal functions; refactor status into its own server
2021-07-27 17:01:39 +00:00
"services/status",
ipc: convert project to use `xous-ipc` This rewrites the entire project so that most runnable projects now use `xous-ipc` instead of `xous::String` where possible. This also removes `rkyv` from the list of dependencies in `xous-rs`. Signed-off-by: Sean Cross <sean@xobs.io>
2021-03-26 12:22:33 +00:00
"imports/com_rs-ref",
"services/ime-plugin-api",
"services/ime-frontend",
"services/ime-plugin-shell",
"services/content-plugin-api",
"services/shellchat",
"services/llio",
add the skeleton for the codec server
2021-05-02 16:20:51 +00:00
"services/codec",
initial frameworks around sha512 acceleration integration
2021-05-18 16:39:03 +00:00
"services/engine-sha512",
beginnings of the curve25519 accelerator engine core driver the engine-25519 server just takes microcode jobs and runs them on the curve25519 accelerator engine. all the fancy crypto stuff comes from other crates, which will be filled in later.
2021-06-21 17:48:51 +00:00
"services/engine-25519",
adding AES native instruction support
2021-06-03 16:49:34 +00:00
"services/aes",
stash commit to fix a bootloader issue
2021-07-13 14:28:46 +00:00
"services/spinor",
figuring out which way is up on the RootKeys implementation
2021-07-21 11:47:09 +00:00
"services/root-keys",
stash to figure out build issue
2021-08-10 12:02:29 +00:00
"services/jtag",
start to lay out skeleton for pddb
2021-10-04 06:50:30 +00:00
"services/pddb",
add some skeleton for a `net` crate; testing COM interrupts
2021-10-08 12:01:13 +00:00
"services/net",
dns. needs more work, but it is at least minimally functional.
2021-10-19 21:18:54 +00:00
"services/dns",
basic framework for modal API wrapping in place
2021-12-15 05:46:24 +00:00
"services/modals",
Add the usb-device-xous driver to the default hardware config Also includes the USB test commands in shellchat. This is different from the usb-test crate, in that it's fully integrated into Xous. usb-test is just for quick-testing the USB driver, in the absence of most of the rest of Xous.
2022-05-16 16:46:52 +00:00
"services/usb-device-xous",
core: add Workspace back in The Workspace turns out to be useful, particularly when handled correctly. This allows for a unification of all packages. Additionally, since we now are focusing on applications and servers now, the decision of which packages to build by default becomes clearer. Finally, we'll be able to use `xbuild` to construct more complex workflows with a full Workspace. Signed-off-by: Sean Cross <sean@xobs.io>
2020-08-17 10:39:33 +00:00
]
ipc: convert project to use `xous-ipc` This rewrites the entire project so that most runnable projects now use `xous-ipc` instead of `xous::String` where possible. This also removes `rkyv` from the list of dependencies in `xous-rs`. Signed-off-by: Sean Cross <sean@xobs.io>
2021-03-26 12:22:33 +00:00
members = [
"xous-ipc",
"xous-rs",
"tools",
"services/graphics-server",
cross-repo update versions from xous-rs bump
2022-10-05 10:32:44 +00:00
"services/xous-log",
"services/xous-ticktimer",
"services/xous-susres",
ipc: convert project to use `xous-ipc` This rewrites the entire project so that most runnable projects now use `xous-ipc` instead of `xous::String` where possible. This also removes `rkyv` from the list of dependencies in `xous-rs`. Signed-off-by: Sean Cross <sean@xobs.io>
2021-03-26 12:22:33 +00:00
"services/xous-names",
cross-repo update versions from xous-rs bump
2022-10-05 10:32:44 +00:00
"services/aes-test",
"services/com",
ipc: convert project to use `xous-ipc` This rewrites the entire project so that most runnable projects now use `xous-ipc` instead of `xous::String` where possible. This also removes `rkyv` from the list of dependencies in `xous-rs`. Signed-off-by: Sean Cross <sean@xobs.io>
2021-03-26 12:22:33 +00:00
"services/keyboard",
"services/kernel-test",
"services/trng",
"services/gam",
extend modal functions; refactor status into its own server
2021-07-27 17:01:39 +00:00
"services/status",
ipc: convert project to use `xous-ipc` This rewrites the entire project so that most runnable projects now use `xous-ipc` instead of `xous::String` where possible. This also removes `rkyv` from the list of dependencies in `xous-rs`. Signed-off-by: Sean Cross <sean@xobs.io>
2021-03-26 12:22:33 +00:00
"services/ime-frontend",
"services/ime-plugin-shell",
lay in another layer of tts functionality now shellchat can talk, and password entries are a thing. next up: debug oom issues in STT when we start doing really big strings.
2022-03-10 18:37:48 +00:00
"services/ime-plugin-tts",
ipc: convert project to use `xous-ipc` This rewrites the entire project so that most runnable projects now use `xous-ipc` instead of `xous::String` where possible. This also removes `rkyv` from the list of dependencies in `xous-rs`. Signed-off-by: Sean Cross <sean@xobs.io>
2021-03-26 12:22:33 +00:00
"services/shellchat",
svd2repl: add program to generate a repl file Signed-off-by: Sean Cross <sean@xobs.io>
2021-05-17 07:50:55 +00:00
"svd2repl",
ipc: convert project to use `xous-ipc` This rewrites the entire project so that most runnable projects now use `xous-ipc` instead of `xous::String` where possible. This also removes `rkyv` from the list of dependencies in `xous-rs`. Signed-off-by: Sean Cross <sean@xobs.io>
2021-03-26 12:22:33 +00:00
"svd2utra",
"xtask",
"imports/com_rs-ref",
beginning of ecdsa port...need to resolve rand_core dependency *everoyne* is relying on rand_core, a later version, that uses a "getrandom" thing that tries to make the call for random number generators generic. I mean, it's kind of cool, but, it's also sort of a libc non-pure-rust nightmare because basically it always delegates to a C-style API for a variety of platforms. Next step is to see if we can't...patch...getrandom to point to a much simplified, xous-only version that is 100% pure Rust.
2022-05-28 15:38:23 +00:00
"imports/getrandom",
ipc: convert project to use `xous-ipc` This rewrites the entire project so that most runnable projects now use `xous-ipc` instead of `xous::String` where possible. This also removes `rkyv` from the list of dependencies in `xous-rs`. Signed-off-by: Sean Cross <sean@xobs.io>
2021-03-26 12:22:33 +00:00
"services/ime-plugin-api",
"services/content-plugin-api",
"services/llio",
add the skeleton for the codec server
2021-05-02 16:20:51 +00:00
"services/codec",
initial frameworks around sha512 acceleration integration
2021-05-18 16:39:03 +00:00
"services/engine-sha512",
beginnings of the curve25519 accelerator engine core driver the engine-25519 server just takes microcode jobs and runs them on the curve25519 accelerator engine. all the fancy crypto stuff comes from other crates, which will be filled in later.
2021-06-21 17:48:51 +00:00
"services/engine-25519",
adding AES native instruction support
2021-06-03 16:49:34 +00:00
"services/aes",
stash commit to fix a bootloader issue
2021-07-13 14:28:46 +00:00
"services/spinor",
figuring out which way is up on the RootKeys implementation
2021-07-21 11:47:09 +00:00
"services/root-keys",
stash to figure out build issue
2021-08-10 12:02:29 +00:00
"services/jtag",
move wycheproof-import to tools
2021-09-06 06:42:19 +00:00
"tools/wycheproof-import",
start to lay out skeleton for pddb
2021-10-04 06:50:30 +00:00
"services/pddb",
add some skeleton for a `net` crate; testing COM interrupts
2021-10-08 12:01:13 +00:00
"services/net",
dns. needs more work, but it is at least minimally functional.
2021-10-19 21:18:54 +00:00
"services/dns",
basic framework for modal API wrapping in place
2021-12-15 05:46:24 +00:00
"services/modals",
laying in some framework for user applications The first "app" is just going to be a whole-framebuffer demo that gets raw keys and does some stuff on the screen. It's the starting point if you wanted to eg. write a simple video game or something for the device, but you didn't care about much of the other UX sugar.
2022-01-23 07:52:17 +00:00
"apps/ball",
Add a basic 'hello world' app example
2022-03-18 15:57:06 +00:00
"apps/hello",
Adds app mtxcli Initial version of mtxcli is simply a copy of repl with the requisite manifest changes to make the app unique. Signed-off-by: Tom Marble <tmarble@info9.net>
2022-10-11 18:40:56 +00:00
"apps/mtxcli",
add a demo REPL app to help users get started with something more interactive
2022-01-24 11:06:58 +00:00
"apps/repl",
migrate u2f to the "vault" app The vault app is the beginning of a multi-purpose authentication vault. It will feature: 1. FIDO2 authentication 2. TOTP authenticators 3. Password storage to PDDB with auto-typing via keyboard HID This is the first step on a very very long journey.
2022-05-27 17:17:54 +00:00
"apps/vault",
chore: forgot to update cargo files after totpbackup rename
2022-07-18 15:30:45 +00:00
"apps/vault/tools/vaultbackup-rs",
add some facilities for testing net in libstd
2022-03-02 12:43:01 +00:00
"services/libstd-test",
stash to work on an aes api bug
2022-03-07 05:17:58 +00:00
"services/ffi-test",
add the basic text to speech infrastructure. also creates a method for isolating incompatibly licensed repos
2022-03-07 19:08:12 +00:00
"services/tts",
test-spawn: move into `services` Move the `test-spawn` program into `services` and document it better. Signed-off-by: Sean Cross <sean@xobs.io>
2022-05-29 11:09:46 +00:00
"services/test-spawn",
"services/test-spawn/spawn",
fix loader for minimal-build hardware
2022-03-13 17:18:36 +00:00
"services/usb-test",
Add the usb-device-xous driver to the default hardware config Also includes the USB test commands in shellchat. This is different from the usb-test crate, in that it's fully integrated into Xous. usb-test is just for quick-testing the USB driver, in the absence of most of the rest of Xous.
2022-05-16 16:46:52 +00:00
"services/usb-device-xous",
add ct profiling to the workspace
2022-09-15 17:45:49 +00:00
"tools/perflib",
kernel: integrate kernel into main monorepo This moves the kernel into the main monorepo, allowing it to share packages with the rest of the system. This change will allow us to reduce the number of rebuilds that take place, as well as reducing disk usage. Note that the loader is still an indepenent project, and the integration of that into the monorepo is pending. Signed-off-by: Sean Cross <sean@xobs.io>
2022-01-14 07:31:36 +00:00
"kernel",
loader: move loader into main workspace Add the loader into the main workspace, removing it from its own sub-workspace. We can do this now that we can specify the linker script in `build.rs`. This improves IDE support, and should shrink disk storage requirements. Signed-off-by: Sean Cross <sean@xobs.io>
2022-01-14 09:32:04 +00:00
"loader",
ipc: convert project to use `xous-ipc` This rewrites the entire project so that most runnable projects now use `xous-ipc` instead of `xous::String` where possible. This also removes `rkyv` from the list of dependencies in `xous-rs`. Signed-off-by: Sean Cross <sean@xobs.io>
2021-03-26 12:22:33 +00:00
]
resolver = "2"
core: add Workspace back in The Workspace turns out to be useful, particularly when handled correctly. This allows for a unification of all packages. Additionally, since we now are focusing on applications and servers now, the decision of which packages to build by default becomes clearer. Finally, we'll be able to use `xbuild` to construct more complex workflows with a full Workspace. Signed-off-by: Sean Cross <sean@xobs.io>
2020-08-17 10:39:33 +00:00
xtask: remove loader, kernel from workspace to fix rebuilds These packages modify RUSTFLAGS, which causes some packages to be rebuilt every time. Move them out of the workspace so as to ensure they don't use the same `target` directory. Signed-off-by: Sean Cross <sean@xobs.io>
2020-08-18 02:51:29 +00:00
# These packages have custom RUSTFLAGS, so if they
# were included in the workspace they would cause
# packages to be rebuilt every time they were touched.
# Keep them out of the main workspace.
exclude = [
simple signature checks in the bootloader now checks xous.img as a single blob before accepting it.
2021-07-12 09:16:22 +00:00
"utralib", # Exclude UTRA, since it is machine-generated.
remove a warning
2021-07-28 16:15:06 +00:00
"locales", # exclude because it is machine-generated
scope ring patches tighter; exclude xtask from workspace config try not to have xtask be affected by the ring patches...
2022-08-20 00:12:45 +00:00
"xtask",
exclude the API crate source from the workspace
2022-09-26 04:16:00 +00:00
# exclude the API crates, as they are domiciled here but referenced via crates.io
cross-repo update versions from xous-rs bump
2022-10-05 10:32:44 +00:00
"api/xous-api-log",
"api/xous-api-names",
"api/xous-api-susres",
"api/xous-api-ticktimer",
xtask: remove loader, kernel from workspace to fix rebuilds These packages modify RUSTFLAGS, which causes some packages to be rebuilt every time. Move them out of the workspace so as to ensure they don't use the same `target` directory. Signed-off-by: Sean Cross <sean@xobs.io>
2020-08-18 02:51:29 +00:00
]
core: add Workspace back in The Workspace turns out to be useful, particularly when handled correctly. This allows for a unification of all packages. Additionally, since we now are focusing on applications and servers now, the decision of which packages to build by default becomes clearer. Finally, we'll be able to use `xbuild` to construct more complex workflows with a full Workspace. Signed-off-by: Sean Cross <sean@xobs.io>
2020-08-17 10:39:33 +00:00
[profile.release]
codegen-units = 1 # 1 better optimizations
revert debug/strip flags, this did not affect the outcome
2022-10-19 13:41:44 +00:00
debug = false
strip = true
cargo: re-enable fat lto mode for whole project Signed-off-by: Sean Cross <sean@xobs.io>
2020-10-11 01:16:46 +00:00
lto = "fat"
cargo: enable incremental builds This should speed up rapid development. Signed-off-by: Sean Cross <sean@xobs.io>
2022-01-14 07:37:13 +00:00
incremental = true
Cargo: add hooks to reduce binary size These can be turned on if we want to reduce the size of our binaries. Signed-off-by: Sean Cross <sean@xobs.io>
2021-05-10 07:09:24 +00:00
#panic = "abort" # Remove panic output, which can reduce file size
commit various project configs
2022-07-04 09:58:52 +00:00
#opt-level = 1 # z,s: Optimize for size instead of performance; 1 for easier debugging
xous-ipc: utilize published `xous 0.8.0` This uses the published version of `libxous`. Signed-off-by: Sean Cross <sean@xobs.io>
2021-04-07 08:38:36 +00:00
attempt to fix up some build system warts
2021-06-27 17:31:43 +00:00
# prefer hardware-accelerated versions of services
refactor engine-sha512 to be named sha2 this makes patch.crates-io much easier to debug, we now have the hardware hasher working in all the places i expect it to.
2021-08-08 20:40:33 +00:00
[patch.crates-io.sha2]
path = "services/engine-sha512"
loader: move loader into main workspace Add the loader into the main workspace, removing it from its own sub-workspace. We can do this now that we can specify the linker script in `build.rs`. This improves IDE support, and should shrink disk storage requirements. Signed-off-by: Sean Cross <sean@xobs.io>
2022-01-14 09:32:04 +00:00
rename aes-xous to aes, and change version number this allows us to patch AES for external crates, too, such as aes_gcm_siv
2021-11-06 21:17:34 +00:00
[patch.crates-io.aes]
path = "services/aes"
add the basic text to speech infrastructure. also creates a method for isolating incompatibly licensed repos
2022-03-07 19:08:12 +00:00
[patch.crates-io.xous-names]
path = "services/xous-names"
isolate a potential compiler bug
2021-06-28 16:10:46 +00:00
button up after debugging the ed25519 issue
2021-06-29 15:46:15 +00:00
[patch.crates-io.curve25519-dalek]
git="https://github.com/betrusted-io/curve25519-dalek.git"
branch="main"
#path = "../curve25519-dalek" # when doing local dev work
fix new compiler warnings since rust 1.55 re: workspace issues
2021-09-10 14:54:01 +00:00
# feature overrides are specified at the crate level
fix up the build system warts & integration with dalek crates we are at least now only requiring users to use our patched curve25519-dalek crate, which now builds cleanly in both xous and std environments, but the higher-level crates can be directly used from crates.io
2021-06-26 19:07:39 +00:00
[patch."https://github.com/betrusted-io/xous-engine-25519.git"]
use Cargo patches so we can target our branch of usb-device we have to add a patch to usb-device because the SpinalHDL UDC needs a little extra handholding on EP0 to switch IN and OUT modes (vs e.g. STM32 where EP0 has IN and OUT descriptors).
2022-05-15 19:09:28 +00:00
engine-25519 = {path = "services/engine-25519"}
[patch.crates-io.usb-device]
git="https://github.com/betrusted-io/usb-device.git"
branch="main"
add maintainer notes
2022-10-20 09:08:16 +00:00
# local dev shortcuts
Add the usb-device-xous driver to the default hardware config Also includes the USB test commands in shellchat. This is different from the usb-test crate, in that it's fully integrated into Xous. usb-test is just for quick-testing the USB driver, in the absence of most of the rest of Xous.
2022-05-16 16:46:52 +00:00
#path = "../usb-device"
fix local dev depenendcy
2022-05-28 19:28:41 +00:00
#[patch.crates-io.usbd-human-interface-device]
#path = "../usbd-human-interface-device"
include a `getrandom` implementation that allows us to use modern randcore A lot of packages are depending on 0.6 api, which requires a crate that has OS specific TRNG calls. This patch keeps the 0.5 calls inside the TRNG crate as direct API calls, and migrates to support a 0.6 api to a patched version of getrandom that supports Xous.
2022-05-28 18:42:14 +00:00
[patch.crates-io.getrandom]
path = "imports/getrandom"
intermediate commit through experiments
2022-08-12 07:56:05 +00:00
[patch.crates-io.ring]
update gitref for ring-xous
2022-09-11 11:16:15 +00:00
# path = "../ring-xous" # for local dev only
try to fix ring dependencies
2022-08-19 17:50:48 +00:00
git="https://github.com/betrusted-io/ring-xous"
bump ring-xous to track latest PR
2022-11-08 17:01:42 +00:00
rev="4296c2e7904898766cf7d8d589759a129794783b" # use the commitref because we're still updating the branch
update to the latest ring-xous
2022-08-22 17:39:54 +00:00
#branch="0.16.20-cleanup"
cross-repo update versions from xous-rs bump
2022-10-05 10:32:44 +00:00
add maintainer notes
2022-10-20 09:08:16 +00:00
######################################################
### PATCHES TO DEV/TEST XOUS KERNEL CODE
###
### The kernel is published to crates.io, and all the packages in Xous are configured to get
### the kernel from crates.io and NOT the local tree.
###
### When making changes to the kernel, you must activate some or all of the patches below
### for the local sources to "see" the changes.
### You will also need to compile with `--no-verify` to acknowledge that you are doing local
### source development and accept that what's on crates.io doesn't match what's inside this tree.
#######################################################
### Minimum recommended patch set: this causes xous-ring to behave correctly when doing local dev
# [patch.crates-io.xous]
# path = "./xous-rs"
# [patch.crates-io.xous-ipc]
# path = "./xous-ipc"
# [patch.crates-io.xous-api-names]
# path = "./api/xous-api-names"
more patches for local build
2022-10-17 15:34:47 +00:00
add maintainer notes
2022-10-20 09:08:16 +00:00
### Selectively patch in these crates, or more, as needed depending on your dev activity
update gitref to latest ring-xous also some commented patches that are helpful for testing utralib changes
2022-10-14 08:25:19 +00:00
# [patch.crates-io.utralib]
# path = "./utralib"
# [patch.crates-io.svd2utra]
add more debug patches
2022-10-16 21:07:46 +00:00
# path = "./svd2utra"
# [patch.crates-io.xous-api-susres]
# path = "./api/xous-api-susres"
# [patch.crates-io.xous-susres]
add debugging into builds this will increase binary size but may help to trace down some instability issues we have seen crop up. probably root cause is something to do with loader init of bss, but other candidates include regression in rust 1.64 and possibly version/crate mismatch issues between api and service crates that were recently split.
2022-10-19 08:01:49 +00:00
# path = "./services/xous-susres"
Reference in a new issue Copy permalink