coelner/fomu-workshop
1
0
Fork 0
mirror of https://github.com/im-tomu/fomu-workshop.git synced 2024-09-20 03:10:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

riscv-rust-blink: fix compatibility with nightly rust

Browse Source 
When using Nightly, the compiler uses inline ASM. However, the ASM
syntax changed (nightly is, after all, unstable).

As a result, dependent crates no longer built.

Furthermore, dependent crates (notably `vexriscv`) changed their
behavior.

This fixes all of that by bumping version numbers as necessary.

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2020-08-04 18:17:36 +08:00
parent ab33fe5653
commit 0955f4031c
2 changed files with 84 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
riscv-rust-blink/Cargo.lock generated
View File

@ -1,42 +1,63 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
name = "bare-metal"
version = "0.2.4"
name = "aho-corasick"
version = "0.7.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3caf393d93b2d453e80638d0674597020cef3382ada454faacd43d1a55a735a"
checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
dependencies = [
"memchr",
]
[[package]]
name = "bare-metal"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5deb64efa5bd81e31fcd1938615a6d98c82eafcbcd787162b6f63b91d6bac5b3"
dependencies = [
"rustc_version",
]
[[package]]
name = "bit_field"
version = "0.9.0"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed8765909f9009617974ab6b7d332625b320b33c326b1e9321382ef1999b5d56"
checksum = "a165d606cf084741d4ac3a28fb6e9b1eb0bd31f6cd999098cfddb0b2ab381dc0"
[[package]]
name = "fomu-pac"
version = "0.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2af12cce32cfd4cfc9c3f7fddbb384331f17b90dacfe28f20cf5e65032a88c6"
version = "0.0.4"
source = "git+https://github.com/xobs/fomu-pac-rs.git?branch=use-riscv-crate#f36c504f4d203cde8fd2e76211598cf0b3cff25c"
dependencies = [
"bare-metal",
"riscv",
"vcell",
"vexriscv",
]
[[package]]
name = "fomu-rt"
version = "0.0.5"
version = "0.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2dc2cec9c34141dbb49e01b229fb8eb75e4a4f70bcee0ec2cf11cff1bbd4a3f"
checksum = "1558c81f106db8546fe5c3b6931d6fb317d024696c35a5c4bf592cc0db6d8345"
dependencies = [
"r0",
"riscv",
"riscv-rt-macros",
"vexriscv",
]
[[package]]
name = "lazy_static"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "memchr"
version = "2.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
[[package]]
name = "panic-halt"
version = "0.2.0"
@ -91,6 +112,35 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
[[package]]
name = "regex"
version = "1.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
dependencies = [
"aho-corasick",
"memchr",
"regex-syntax",
"thread_local",
]
[[package]]
name = "regex-syntax"
version = "0.6.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
[[package]]
name = "riscv"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2f0b705d428e9d0f78e2bb73093887ee58a83c9688de3faedbb4c0631c4618e"
dependencies = [
"bare-metal",
"bit_field",
"riscv-target",
]
[[package]]
name = "riscv-rt-macros"
version = "0.1.6"
@ -112,6 +162,16 @@ dependencies = [
"panic-halt",
]
[[package]]
name = "riscv-target"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "88aa938cda42a0cf62a20cfe8d139ff1af20c2e681212b5b34adb5a58333f222"
dependencies = [
"lazy_static",
"regex",
]
[[package]]
name = "rustc_version"
version = "0.2.3"
@ -147,6 +207,15 @@ dependencies = [
"unicode-xid",
]
[[package]]
name = "thread_local"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
dependencies = [
"lazy_static",
]
[[package]]
name = "unicode-xid"
version = "0.1.0"
@ -161,10 +230,6 @@ checksum = "876e32dcadfe563a4289e994f7cb391197f362b6315dc45e8ba4aa6f564a4b3c"
[[package]]
name = "vexriscv"
version = "0.0.1"
version = "0.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2d1f49e9cf019df156f5c2e543dc05e7410ceed873b6ac4ed8106bc3818cff7"
dependencies = [
"bare-metal",
"bit_field",
]
checksum = "6eac3d398d0468c76272ea6b2c187d3696f0ed126325f8f41ccc711e9e74cd06"

4
riscv-rust-blink/Cargo.toml
View File

@ -7,8 +7,8 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
fomu-pac = "0.0.3"
fomu-rt = "0.0.5"
fomu-pac = { git = "https://github.com/xobs/fomu-pac-rs.git", branch = "use-riscv-crate" }
fomu-rt = "0.0.6"
panic-halt = "0.2"