Skip to content

Commit d29c4b1

Browse files
jessebrahamjessebraham
authored
Update a number of dependencies to get RISC-V HALs building again (#350)
* Update `riscv`, `riscv-rt` dependencies, plus PACs for RISC-V chips * Update `riscv-atomic-emulation-trap` package * Update the `embassy-executor` dev dependency to a newer version
1 parent ac206af commit d29c4b1

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

‎esp-hal-common/Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ embassy-sync = { version = "0.1.0", optional = true }
3434
embassy-time = { version = "0.1.0", features = ["nightly"], optional = true }
3535

3636
# RISC-V
37-
riscv = { version = "0.10.0", optional = true }
38-
riscv-atomic-emulation-trap = { version = "0.3.0", optional = true }
37+
riscv = { version = "0.10.1", optional = true }
38+
riscv-atomic-emulation-trap = { version = "0.3.1", optional = true }
3939

4040
# Xtensa
4141
xtensa-lx = { version = "0.7.0", optional = true }
@@ -52,8 +52,8 @@ ufmt-write = { version = "0.1.0", optional = true }
5252
# corresponding feature. We rename the PAC packages because we cannot
5353
# have dependencies and features with the same names.
5454
esp32 = { version = "0.19.0", features = ["critical-section"], optional = true }
55-
esp32c2 = { version = "0.6.0", features = ["critical-section"], optional = true }
56-
esp32c3 = { version = "0.9.0", features = ["critical-section"], optional = true }
55+
esp32c2 = { version = "0.6.1", features = ["critical-section"], optional = true }
56+
esp32c3 = { version = "0.9.1", features = ["critical-section"], optional = true }
5757
esp32s2 = { version = "0.9.0", features = ["critical-section"], optional = true }
5858
esp32s3 = { version = "0.13.0", features = ["critical-section"], optional = true }
5959

@@ -84,7 +84,7 @@ async = ["embedded-hal-async", "eh1", "embassy-sync"]
8484
embassy = ["embassy-time"]
8585

8686
embassy-time-systick = []
87-
embassy-time-timg0 = []
87+
embassy-time-timg0 = []
8888

8989
# Architecture-specific features (intended for internal use)
9090
riscv = ["dep:riscv", "critical-section/restore-state-u8", "procmacros/riscv", "riscv-atomic-emulation-trap"]

‎esp32-hal/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ xtensa-lx-rt = { version = "0.14.0", features = ["esp32"], optional = true
3636

3737
[dev-dependencies]
3838
critical-section = "1.1.1"
39-
embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "eed34f9", features = ["nightly", "integrated-timers"] }
39+
embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "cd9a65b", features = ["nightly", "integrated-timers"] }
4040
embedded-graphics = "0.7.1"
4141
esp-backtrace = { version = "0.4.0", features = ["esp32", "panic-handler", "exception-handler", "print-uart"] }
4242
esp-println = { version = "0.3.1", features = ["esp32"] }

‎esp32c2-hal/Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ embedded-hal-async = { version = "0.1.0-alpha.3", optional = true }
3232
embedded-hal-nb = { version = "=1.0.0-alpha.1", optional = true }
3333
esp-hal-common = { version = "0.4.0", features = ["esp32c2"], path = "../esp-hal-common" }
3434
r0 = "1.0.0"
35-
riscv = "0.10.0"
36-
riscv-rt = { version = "0.10.0", optional = true }
35+
riscv = "0.10.1"
36+
riscv-rt = { version = "0.11.0", optional = true }
3737

3838
[dev-dependencies]
3939
critical-section = "1.1.1"
40-
embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "eed34f9", features = ["nightly", "integrated-timers"] }
40+
embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "cd9a65b", features = ["nightly", "integrated-timers"] }
4141
embedded-graphics = "0.7.1"
4242
esp-backtrace = { version = "0.4.0", features = ["esp32c2", "panic-handler", "exception-handler", "print-uart"] }
4343
esp-println = { version = "0.3.1", features = ["esp32c2"] }
@@ -55,9 +55,9 @@ vectored = ["esp-hal-common/vectored"]
5555
async = ["esp-hal-common/async", "embedded-hal-async"]
5656
embassy = ["esp-hal-common/embassy"]
5757
embassy-time-systick = ["esp-hal-common/embassy-time-systick", "embassy-time/tick-hz-16_000_000"]
58-
embassy-time-timg0 = ["esp-hal-common/embassy-time-timg0", "embassy-time/tick-hz-1_000_000"]
59-
xtal40mhz = ["esp-hal-common/esp32c2_40mhz"]
58+
embassy-time-timg0 = ["esp-hal-common/embassy-time-timg0", "embassy-time/tick-hz-1_000_000"]
6059
xtal26mhz = ["esp-hal-common/esp32c2_26mhz"]
60+
xtal40mhz = ["esp-hal-common/esp32c2_40mhz"]
6161

6262
[[example]]
6363
name = "spi_eh1_loopback"

‎esp32c3-hal/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ embedded-hal-nb = { version = "=1.0.0-alpha.1", optional = true }
3434
embedded-can = { version = "0.4.1", optional = true }
3535
esp-hal-common = { version = "0.4.0", features = ["esp32c3"], path = "../esp-hal-common" }
3636
r0 = "1.0.0"
37-
riscv = "0.10.0"
38-
riscv-rt = { version = "0.10.0", optional = true }
37+
riscv = "0.10.1"
38+
riscv-rt = { version = "0.11.0", optional = true }
3939

4040
[dev-dependencies]
4141
critical-section = "1.1.1"
42-
embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "eed34f9", features = ["nightly", "integrated-timers"] }
42+
embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "cd9a65b", features = ["nightly", "integrated-timers"] }
4343
embedded-graphics = "0.7.1"
4444
esp-backtrace = { version = "0.4.0", features = ["esp32c3", "panic-handler", "exception-handler", "print-uart"] }
4545
esp-println = { version = "0.3.1", features = ["esp32c3"] }

‎esp32s2-hal/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ xtensa-atomic-emulation-trap = { version = "0.3.0", features = ["esp32s2"] }
3737

3838
[dev-dependencies]
3939
critical-section = "1.1.1"
40-
embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "eed34f9", features = ["nightly", "integrated-timers"] }
40+
embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "cd9a65b", features = ["nightly", "integrated-timers"] }
4141
embedded-graphics = "0.7.1"
4242
esp-backtrace = { version = "0.4.0", features = ["esp32s2", "panic-handler", "print-uart"] }
4343
esp-println = { version = "0.3.1", features = ["esp32s2"] }

‎esp32s3-hal/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ xtensa-lx-rt = { version = "0.14.0", features = ["esp32s3"], optional = tr
3939

4040
[dev-dependencies]
4141
critical-section = "1.1.1"
42-
embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "eed34f9", features = ["nightly", "integrated-timers"] }
42+
embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "cd9a65b", features = ["nightly", "integrated-timers"] }
4343
embedded-graphics = "0.7.1"
4444
esp-backtrace = { version = "0.4.0", features = ["esp32s3", "panic-handler", "exception-handler", "print-uart"] }
4545
esp-println = { version = "0.3.1", features = ["esp32s3"] }

0 commit comments

Comments
 (0)