andrey/k210-sdk-stuff
1
0
Fork 0
mirror of https://github.com/laanwj/k210-sdk-stuff.git synced 2025-01-18 21:17:09 +04:00
Code Issues Projects Releases Wiki Activity

rust: Clean up cargo patches

Browse Source 
No more need for any `k210-hal` and `k210-pac` patches with 0.2.0
This commit is contained in:
Wladimir J. van der Laan 2019-12-28 20:16:40 +00:00
parent 33eab72e3e
commit a1c65405ea
18 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rust/Cargo.toml
View File

@ -18,11 +18,7 @@ members = [
] ]
[patch.crates-io] [patch.crates-io]
k210-hal = { git = "https://github.com/riscv-rust/k210-hal.git", rev = "b83e843c19a2f0bc4eb7f56322ae844818709298" }
k210-pac = { git = "https://github.com/riscv-rust/k210-pac.git", rev = "ce714c0b09a71e5b73357a479295e9ea1201501e" }
# TODO: upstream these patches after the dependent change rust-lang/rust#62281 ends up in stable # TODO: upstream these patches after the dependent change rust-lang/rust#62281 ends up in stable
# patch: "Remove work-around for pcrel issue"
# patch: "risc-v: Use medany model" # patch: "risc-v: Use medany model"
cc = { git = "https://github.com/laanwj/cc-rs.git", rev = "83e66a79a25b55d0aa84db42257a8edbb0095cf8" } cc = { git = "https://github.com/laanwj/cc-rs.git", rev = "83e66a79a25b55d0aa84db42257a8edbb0095cf8" }

2
rust/accelerometer/Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2018"
[dependencies] [dependencies]
riscv-rt = "0.6" riscv-rt = "0.6"
k210-hal = "0.1.0" k210-hal = "0.2.0"
riscv = "0.5" riscv = "0.5"
libm = "0.1" libm = "0.1"
k210-shared = { path = "../k210-shared" } k210-shared = { path = "../k210-shared" }

2
rust/buffered-uart/Cargo.toml
View File

@ -7,6 +7,6 @@ edition = "2018"
[dependencies] [dependencies]
bare-metal = "0.2.0" bare-metal = "0.2.0"
riscv-rt = "0.6" riscv-rt = "0.6"
k210-hal = "0.1.0" k210-hal = "0.2.0"
riscv = { version = "0.5", features = ["inline-asm"] } riscv = { version = "0.5", features = ["inline-asm"] }
k210-shared = { path = "../k210-shared" } k210-shared = { path = "../k210-shared" }

2
rust/dvp-ov/Cargo.toml
View File

@ -6,6 +6,6 @@ edition = "2018"
[dependencies] [dependencies]
riscv-rt = "0.6" riscv-rt = "0.6"
k210-hal = "0.1.0" k210-hal = "0.2.0"
riscv = "0.5" riscv = "0.5"
k210-shared = { path = "../k210-shared" } k210-shared = { path = "../k210-shared" }

2
rust/embgfx/Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2018"
[dependencies] [dependencies]
riscv-rt = "0.6" riscv-rt = "0.6"
k210-hal = "0.1.0" k210-hal = "0.2.0"
riscv = "0.5" riscv = "0.5"
libm = "0.1" libm = "0.1"
k210-shared = { path = "../k210-shared" } k210-shared = { path = "../k210-shared" }

2
rust/game-of-life/Cargo.toml
View File

@ -6,6 +6,6 @@ edition = "2018"
[dependencies] [dependencies]
riscv-rt = "0.6" riscv-rt = "0.6"
k210-hal = "0.1.0" k210-hal = "0.2.0"
riscv = "0.5" riscv = "0.5"
k210-shared = { path = "../k210-shared" } k210-shared = { path = "../k210-shared" }

2
rust/glyph-mapping/Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2018"
[dependencies] [dependencies]
riscv-rt = "0.6" riscv-rt = "0.6"
k210-hal = "0.1.0" k210-hal = "0.2.0"
riscv = "0.5" riscv = "0.5"
k210-shared = { path = "../k210-shared" } k210-shared = { path = "../k210-shared" }
k210-console = { path = "../k210-console" } k210-console = { path = "../k210-console" }

2
rust/interrupt/Cargo.toml
View File

@ -6,6 +6,6 @@ edition = "2018"
[dependencies] [dependencies]
riscv-rt = "0.6" riscv-rt = "0.6"
k210-hal = "0.1.0" k210-hal = "0.2.0"
riscv = { version = "0.5", features = ["inline-asm"] } riscv = { version = "0.5", features = ["inline-asm"] }
k210-shared = { path = "../k210-shared" } k210-shared = { path = "../k210-shared" }

2
rust/k210-console/Cargo.toml
View File

@ -6,6 +6,6 @@ edition = "2018"
[dependencies] [dependencies]
riscv-rt = "0.6" riscv-rt = "0.6"
k210-hal = "0.1.0" k210-hal = "0.2.0"
riscv = "0.5" riscv = "0.5"
k210-shared = { path = "../k210-shared" } k210-shared = { path = "../k210-shared" }

2
rust/k210-shared/Cargo.toml
View File

@ -5,7 +5,7 @@ authors = ["W.J. van der Laan <laanwj@protonmail.com>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
k210-hal = "0.1.0" k210-hal = "0.2.0"
libm = "0.1" libm = "0.1"
riscv = "0.5" riscv = "0.5"
riscv-rt = "0.6" riscv-rt = "0.6"

2
rust/mandelbrot/Cargo.toml
View File

@ -6,6 +6,6 @@ edition = "2018"
[dependencies] [dependencies]
riscv-rt = "0.6" riscv-rt = "0.6"
k210-hal = "0.1.0" k210-hal = "0.2.0"
riscv = "0.5" riscv = "0.5"
k210-shared = { path = "../k210-shared" } k210-shared = { path = "../k210-shared" }

2
rust/rgbcontrol/Cargo.toml
View File

@ -5,7 +5,7 @@ authors = ["W.J. van der Laan <laanwj@protonmail.com>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
k210-hal = "0.1.0" k210-hal = "0.2.0"
k210-shared = { path = "../k210-shared" } k210-shared = { path = "../k210-shared" }
riscv = "0.5" riscv = "0.5"
riscv-rt = "0.6" riscv-rt = "0.6"

2
rust/sdlcd/Cargo.toml
View File

@ -7,6 +7,6 @@ edition = "2018"
[dependencies] [dependencies]
nb = "0.1.1" nb = "0.1.1"
riscv-rt = "0.6" riscv-rt = "0.6"
k210-hal = "0.1.0" k210-hal = "0.2.0"
riscv = "0.5" riscv = "0.5"
k210-shared = { path = "../k210-shared" } k210-shared = { path = "../k210-shared" }

2
rust/sdtest/Cargo.toml
View File

@ -7,6 +7,6 @@ edition = "2018"
[dependencies] [dependencies]
nb = "0.1.1" nb = "0.1.1"
riscv-rt = "0.6" riscv-rt = "0.6"
k210-hal = "0.1.0" k210-hal = "0.2.0"
riscv = "0.5" riscv = "0.5"
k210-shared = { path = "../k210-shared" } k210-shared = { path = "../k210-shared" }

2
rust/secp256k1-test/Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2018"
[dependencies] [dependencies]
riscv-rt = "0.6" riscv-rt = "0.6"
k210-hal = "0.1.0" k210-hal = "0.2.0"
riscv = "0.5" riscv = "0.5"
k210-shared = { path = "../k210-shared" } k210-shared = { path = "../k210-shared" }
secp256k1 = { version = "0.15.2", default-features = false, features = ['lowmemory'] } secp256k1 = { version = "0.15.2", default-features = false, features = ['lowmemory'] }

2
rust/term-server/Cargo.toml
View File

@ -8,7 +8,7 @@ edition = "2018"
embedded-hal = { version = "0.2.1", features = ["unproven"] } embedded-hal = { version = "0.2.1", features = ["unproven"] }
nb = "0.1.1" nb = "0.1.1"
riscv-rt = "0.6" riscv-rt = "0.6"
k210-hal = "0.1.0" k210-hal = "0.2.0"
riscv = "0.5" riscv = "0.5"
k210-shared = { path = "../k210-shared" } k210-shared = { path = "../k210-shared" }
k210-console = { path = "../k210-console" } k210-console = { path = "../k210-console" }

2
rust/uart-passthrough/Cargo.toml
View File

@ -7,6 +7,6 @@ edition = "2018"
[dependencies] [dependencies]
nb = "0.1.1" nb = "0.1.1"
riscv-rt = "0.6" riscv-rt = "0.6"
k210-hal = "0.1.0" k210-hal = "0.2.0"
riscv = "0.5" riscv = "0.5"
k210-shared = { path = "../k210-shared" } k210-shared = { path = "../k210-shared" }

2
rust/weather/Cargo.toml
View File

@ -8,7 +8,7 @@ edition = "2018"
embedded-hal = { version = "0.2.1", features = ["unproven"] } embedded-hal = { version = "0.2.1", features = ["unproven"] }
nb = "0.1.1" nb = "0.1.1"
riscv-rt = "0.6" riscv-rt = "0.6"
k210-hal = "0.1.0" k210-hal = "0.2.0"
riscv = "0.5" riscv = "0.5"
k210-shared = { path = "../k210-shared" } k210-shared = { path = "../k210-shared" }
k210-console = { path = "../k210-console" } k210-console = { path = "../k210-console" }