From a1c65405eaa1b320d1f21597fe394adf4c82c4ae Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Sat, 28 Dec 2019 20:16:40 +0000 Subject: [PATCH] rust: Clean up cargo patches No more need for any `k210-hal` and `k210-pac` patches with 0.2.0 --- rust/Cargo.toml | 4 ---- rust/accelerometer/Cargo.toml | 2 +- rust/buffered-uart/Cargo.toml | 2 +- rust/dvp-ov/Cargo.toml | 2 +- rust/embgfx/Cargo.toml | 2 +- rust/game-of-life/Cargo.toml | 2 +- rust/glyph-mapping/Cargo.toml | 2 +- rust/interrupt/Cargo.toml | 2 +- rust/k210-console/Cargo.toml | 2 +- rust/k210-shared/Cargo.toml | 2 +- rust/mandelbrot/Cargo.toml | 2 +- rust/rgbcontrol/Cargo.toml | 2 +- rust/sdlcd/Cargo.toml | 2 +- rust/sdtest/Cargo.toml | 2 +- rust/secp256k1-test/Cargo.toml | 2 +- rust/term-server/Cargo.toml | 2 +- rust/uart-passthrough/Cargo.toml | 2 +- rust/weather/Cargo.toml | 2 +- 18 files changed, 17 insertions(+), 21 deletions(-) diff --git a/rust/Cargo.toml b/rust/Cargo.toml index b09bd9a..b5994ab 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -18,11 +18,7 @@ members = [ ] [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 -# patch: "Remove work-around for pcrel issue" - # patch: "risc-v: Use medany model" cc = { git = "https://github.com/laanwj/cc-rs.git", rev = "83e66a79a25b55d0aa84db42257a8edbb0095cf8" } diff --git a/rust/accelerometer/Cargo.toml b/rust/accelerometer/Cargo.toml index e7762a5..5063b78 100644 --- a/rust/accelerometer/Cargo.toml +++ b/rust/accelerometer/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] riscv-rt = "0.6" -k210-hal = "0.1.0" +k210-hal = "0.2.0" riscv = "0.5" libm = "0.1" k210-shared = { path = "../k210-shared" } diff --git a/rust/buffered-uart/Cargo.toml b/rust/buffered-uart/Cargo.toml index 390e6a4..31fc8c9 100644 --- a/rust/buffered-uart/Cargo.toml +++ b/rust/buffered-uart/Cargo.toml @@ -7,6 +7,6 @@ edition = "2018" [dependencies] bare-metal = "0.2.0" riscv-rt = "0.6" -k210-hal = "0.1.0" +k210-hal = "0.2.0" riscv = { version = "0.5", features = ["inline-asm"] } k210-shared = { path = "../k210-shared" } diff --git a/rust/dvp-ov/Cargo.toml b/rust/dvp-ov/Cargo.toml index 96584c4..2bb3fc3 100644 --- a/rust/dvp-ov/Cargo.toml +++ b/rust/dvp-ov/Cargo.toml @@ -6,6 +6,6 @@ edition = "2018" [dependencies] riscv-rt = "0.6" -k210-hal = "0.1.0" +k210-hal = "0.2.0" riscv = "0.5" k210-shared = { path = "../k210-shared" } diff --git a/rust/embgfx/Cargo.toml b/rust/embgfx/Cargo.toml index c1c7b24..adfc29c 100644 --- a/rust/embgfx/Cargo.toml +++ b/rust/embgfx/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] riscv-rt = "0.6" -k210-hal = "0.1.0" +k210-hal = "0.2.0" riscv = "0.5" libm = "0.1" k210-shared = { path = "../k210-shared" } diff --git a/rust/game-of-life/Cargo.toml b/rust/game-of-life/Cargo.toml index c8cce2d..199d830 100644 --- a/rust/game-of-life/Cargo.toml +++ b/rust/game-of-life/Cargo.toml @@ -6,6 +6,6 @@ edition = "2018" [dependencies] riscv-rt = "0.6" -k210-hal = "0.1.0" +k210-hal = "0.2.0" riscv = "0.5" k210-shared = { path = "../k210-shared" } diff --git a/rust/glyph-mapping/Cargo.toml b/rust/glyph-mapping/Cargo.toml index 9c55584..6b8d3e1 100644 --- a/rust/glyph-mapping/Cargo.toml +++ b/rust/glyph-mapping/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] riscv-rt = "0.6" -k210-hal = "0.1.0" +k210-hal = "0.2.0" riscv = "0.5" k210-shared = { path = "../k210-shared" } k210-console = { path = "../k210-console" } diff --git a/rust/interrupt/Cargo.toml b/rust/interrupt/Cargo.toml index 3d1f636..4897b39 100644 --- a/rust/interrupt/Cargo.toml +++ b/rust/interrupt/Cargo.toml @@ -6,6 +6,6 @@ edition = "2018" [dependencies] riscv-rt = "0.6" -k210-hal = "0.1.0" +k210-hal = "0.2.0" riscv = { version = "0.5", features = ["inline-asm"] } k210-shared = { path = "../k210-shared" } diff --git a/rust/k210-console/Cargo.toml b/rust/k210-console/Cargo.toml index d1030fa..551fc1d 100644 --- a/rust/k210-console/Cargo.toml +++ b/rust/k210-console/Cargo.toml @@ -6,6 +6,6 @@ edition = "2018" [dependencies] riscv-rt = "0.6" -k210-hal = "0.1.0" +k210-hal = "0.2.0" riscv = "0.5" k210-shared = { path = "../k210-shared" } diff --git a/rust/k210-shared/Cargo.toml b/rust/k210-shared/Cargo.toml index 55991f0..16cab16 100644 --- a/rust/k210-shared/Cargo.toml +++ b/rust/k210-shared/Cargo.toml @@ -5,7 +5,7 @@ authors = ["W.J. van der Laan "] edition = "2018" [dependencies] -k210-hal = "0.1.0" +k210-hal = "0.2.0" libm = "0.1" riscv = "0.5" riscv-rt = "0.6" diff --git a/rust/mandelbrot/Cargo.toml b/rust/mandelbrot/Cargo.toml index 6d1f51a..6666e4b 100644 --- a/rust/mandelbrot/Cargo.toml +++ b/rust/mandelbrot/Cargo.toml @@ -6,6 +6,6 @@ edition = "2018" [dependencies] riscv-rt = "0.6" -k210-hal = "0.1.0" +k210-hal = "0.2.0" riscv = "0.5" k210-shared = { path = "../k210-shared" } diff --git a/rust/rgbcontrol/Cargo.toml b/rust/rgbcontrol/Cargo.toml index 3ca0fe9..72e4aa8 100644 --- a/rust/rgbcontrol/Cargo.toml +++ b/rust/rgbcontrol/Cargo.toml @@ -5,7 +5,7 @@ authors = ["W.J. van der Laan "] edition = "2018" [dependencies] -k210-hal = "0.1.0" +k210-hal = "0.2.0" k210-shared = { path = "../k210-shared" } riscv = "0.5" riscv-rt = "0.6" diff --git a/rust/sdlcd/Cargo.toml b/rust/sdlcd/Cargo.toml index bff3932..1d40fa5 100644 --- a/rust/sdlcd/Cargo.toml +++ b/rust/sdlcd/Cargo.toml @@ -7,6 +7,6 @@ edition = "2018" [dependencies] nb = "0.1.1" riscv-rt = "0.6" -k210-hal = "0.1.0" +k210-hal = "0.2.0" riscv = "0.5" k210-shared = { path = "../k210-shared" } diff --git a/rust/sdtest/Cargo.toml b/rust/sdtest/Cargo.toml index 3a7ebf9..b605656 100644 --- a/rust/sdtest/Cargo.toml +++ b/rust/sdtest/Cargo.toml @@ -7,6 +7,6 @@ edition = "2018" [dependencies] nb = "0.1.1" riscv-rt = "0.6" -k210-hal = "0.1.0" +k210-hal = "0.2.0" riscv = "0.5" k210-shared = { path = "../k210-shared" } diff --git a/rust/secp256k1-test/Cargo.toml b/rust/secp256k1-test/Cargo.toml index 181e2ba..c04f38d 100644 --- a/rust/secp256k1-test/Cargo.toml +++ b/rust/secp256k1-test/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] riscv-rt = "0.6" -k210-hal = "0.1.0" +k210-hal = "0.2.0" riscv = "0.5" k210-shared = { path = "../k210-shared" } secp256k1 = { version = "0.15.2", default-features = false, features = ['lowmemory'] } diff --git a/rust/term-server/Cargo.toml b/rust/term-server/Cargo.toml index c7ff666..702c3f1 100644 --- a/rust/term-server/Cargo.toml +++ b/rust/term-server/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" embedded-hal = { version = "0.2.1", features = ["unproven"] } nb = "0.1.1" riscv-rt = "0.6" -k210-hal = "0.1.0" +k210-hal = "0.2.0" riscv = "0.5" k210-shared = { path = "../k210-shared" } k210-console = { path = "../k210-console" } diff --git a/rust/uart-passthrough/Cargo.toml b/rust/uart-passthrough/Cargo.toml index 686ee92..e19e444 100644 --- a/rust/uart-passthrough/Cargo.toml +++ b/rust/uart-passthrough/Cargo.toml @@ -7,6 +7,6 @@ edition = "2018" [dependencies] nb = "0.1.1" riscv-rt = "0.6" -k210-hal = "0.1.0" +k210-hal = "0.2.0" riscv = "0.5" k210-shared = { path = "../k210-shared" } diff --git a/rust/weather/Cargo.toml b/rust/weather/Cargo.toml index 1ecff4c..82fe12d 100644 --- a/rust/weather/Cargo.toml +++ b/rust/weather/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" embedded-hal = { version = "0.2.1", features = ["unproven"] } nb = "0.1.1" riscv-rt = "0.6" -k210-hal = "0.1.0" +k210-hal = "0.2.0" riscv = "0.5" k210-shared = { path = "../k210-shared" } k210-console = { path = "../k210-console" }