From fabc48be89b7d2b1d89d676a6e339f517a40ae78 Mon Sep 17 00:00:00 2001 From: Jesse Braham Date: Wed, 18 Jan 2023 13:30:23 -0800 Subject: [PATCH 1/3] Update `riscv`, `riscv-rt` dependencies, plus PACs for RISC-V chips --- esp-hal-common/Cargo.toml | 8 ++++---- esp32c2-hal/Cargo.toml | 8 ++++---- esp32c3-hal/Cargo.toml | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/esp-hal-common/Cargo.toml b/esp-hal-common/Cargo.toml index e8558e381a2..8c1029afbf2 100644 --- a/esp-hal-common/Cargo.toml +++ b/esp-hal-common/Cargo.toml @@ -34,7 +34,7 @@ embassy-sync = { version = "0.1.0", optional = true } embassy-time = { version = "0.1.0", features = ["nightly"], optional = true } # RISC-V -riscv = { version = "0.10.0", optional = true } +riscv = { version = "0.10.1", optional = true } riscv-atomic-emulation-trap = { version = "0.3.0", optional = true } # Xtensa @@ -52,8 +52,8 @@ ufmt-write = { version = "0.1.0", optional = true } # corresponding feature. We rename the PAC packages because we cannot # have dependencies and features with the same names. esp32 = { version = "0.19.0", features = ["critical-section"], optional = true } -esp32c2 = { version = "0.6.0", features = ["critical-section"], optional = true } -esp32c3 = { version = "0.9.0", features = ["critical-section"], optional = true } +esp32c2 = { version = "0.6.1", features = ["critical-section"], optional = true } +esp32c3 = { version = "0.9.1", features = ["critical-section"], optional = true } esp32s2 = { version = "0.9.0", features = ["critical-section"], optional = true } esp32s3 = { version = "0.13.0", features = ["critical-section"], optional = true } @@ -84,7 +84,7 @@ async = ["embedded-hal-async", "eh1", "embassy-sync"] embassy = ["embassy-time"] embassy-time-systick = [] -embassy-time-timg0 = [] +embassy-time-timg0 = [] # Architecture-specific features (intended for internal use) riscv = ["dep:riscv", "critical-section/restore-state-u8", "procmacros/riscv", "riscv-atomic-emulation-trap"] diff --git a/esp32c2-hal/Cargo.toml b/esp32c2-hal/Cargo.toml index b08615fbe58..de0f2052c9c 100644 --- a/esp32c2-hal/Cargo.toml +++ b/esp32c2-hal/Cargo.toml @@ -32,8 +32,8 @@ embedded-hal-async = { version = "0.1.0-alpha.3", optional = true } embedded-hal-nb = { version = "=1.0.0-alpha.1", optional = true } esp-hal-common = { version = "0.4.0", features = ["esp32c2"], path = "../esp-hal-common" } r0 = "1.0.0" -riscv = "0.10.0" -riscv-rt = { version = "0.10.0", optional = true } +riscv = "0.10.1" +riscv-rt = { version = "0.11.0", optional = true } [dev-dependencies] critical-section = "1.1.1" @@ -55,9 +55,9 @@ vectored = ["esp-hal-common/vectored"] async = ["esp-hal-common/async", "embedded-hal-async"] embassy = ["esp-hal-common/embassy"] embassy-time-systick = ["esp-hal-common/embassy-time-systick", "embassy-time/tick-hz-16_000_000"] -embassy-time-timg0 = ["esp-hal-common/embassy-time-timg0", "embassy-time/tick-hz-1_000_000"] -xtal40mhz = ["esp-hal-common/esp32c2_40mhz"] +embassy-time-timg0 = ["esp-hal-common/embassy-time-timg0", "embassy-time/tick-hz-1_000_000"] xtal26mhz = ["esp-hal-common/esp32c2_26mhz"] +xtal40mhz = ["esp-hal-common/esp32c2_40mhz"] [[example]] name = "spi_eh1_loopback" diff --git a/esp32c3-hal/Cargo.toml b/esp32c3-hal/Cargo.toml index 7df9a8f5cd8..1e4a939884e 100644 --- a/esp32c3-hal/Cargo.toml +++ b/esp32c3-hal/Cargo.toml @@ -34,8 +34,8 @@ embedded-hal-nb = { version = "=1.0.0-alpha.1", optional = true } embedded-can = { version = "0.4.1", optional = true } esp-hal-common = { version = "0.4.0", features = ["esp32c3"], path = "../esp-hal-common" } r0 = "1.0.0" -riscv = "0.10.0" -riscv-rt = { version = "0.10.0", optional = true } +riscv = "0.10.1" +riscv-rt = { version = "0.11.0", optional = true } [dev-dependencies] critical-section = "1.1.1" From be31706d4055167f63461478fda6d6de2e3bfa00 Mon Sep 17 00:00:00 2001 From: Jesse Braham Date: Wed, 18 Jan 2023 13:49:05 -0800 Subject: [PATCH 2/3] Update `riscv-atomic-emulation-trap` package --- esp-hal-common/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esp-hal-common/Cargo.toml b/esp-hal-common/Cargo.toml index 8c1029afbf2..746dc55d236 100644 --- a/esp-hal-common/Cargo.toml +++ b/esp-hal-common/Cargo.toml @@ -35,7 +35,7 @@ embassy-time = { version = "0.1.0", features = ["nightly"], optional = tru # RISC-V riscv = { version = "0.10.1", optional = true } -riscv-atomic-emulation-trap = { version = "0.3.0", optional = true } +riscv-atomic-emulation-trap = { version = "0.3.1", optional = true } # Xtensa xtensa-lx = { version = "0.7.0", optional = true } From 35a1fa4556c1bbd51fbf7ffb85f93e21dae57a50 Mon Sep 17 00:00:00 2001 From: Jesse Braham Date: Wed, 18 Jan 2023 13:49:27 -0800 Subject: [PATCH 3/3] Update the `embassy-executor` dev dependency to a newer version --- esp32-hal/Cargo.toml | 2 +- esp32c2-hal/Cargo.toml | 2 +- esp32c3-hal/Cargo.toml | 2 +- esp32s2-hal/Cargo.toml | 2 +- esp32s3-hal/Cargo.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/esp32-hal/Cargo.toml b/esp32-hal/Cargo.toml index f6134673532..3119c4aa62d 100644 --- a/esp32-hal/Cargo.toml +++ b/esp32-hal/Cargo.toml @@ -36,7 +36,7 @@ xtensa-lx-rt = { version = "0.14.0", features = ["esp32"], optional = true [dev-dependencies] critical-section = "1.1.1" -embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "eed34f9", features = ["nightly", "integrated-timers"] } +embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "cd9a65b", features = ["nightly", "integrated-timers"] } embedded-graphics = "0.7.1" esp-backtrace = { version = "0.4.0", features = ["esp32", "panic-handler", "exception-handler", "print-uart"] } esp-println = { version = "0.3.1", features = ["esp32"] } diff --git a/esp32c2-hal/Cargo.toml b/esp32c2-hal/Cargo.toml index de0f2052c9c..09123546a5c 100644 --- a/esp32c2-hal/Cargo.toml +++ b/esp32c2-hal/Cargo.toml @@ -37,7 +37,7 @@ riscv-rt = { version = "0.11.0", optional = true } [dev-dependencies] critical-section = "1.1.1" -embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "eed34f9", features = ["nightly", "integrated-timers"] } +embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "cd9a65b", features = ["nightly", "integrated-timers"] } embedded-graphics = "0.7.1" esp-backtrace = { version = "0.4.0", features = ["esp32c2", "panic-handler", "exception-handler", "print-uart"] } esp-println = { version = "0.3.1", features = ["esp32c2"] } diff --git a/esp32c3-hal/Cargo.toml b/esp32c3-hal/Cargo.toml index 1e4a939884e..9f18ae4941b 100644 --- a/esp32c3-hal/Cargo.toml +++ b/esp32c3-hal/Cargo.toml @@ -39,7 +39,7 @@ riscv-rt = { version = "0.11.0", optional = true } [dev-dependencies] critical-section = "1.1.1" -embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "eed34f9", features = ["nightly", "integrated-timers"] } +embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "cd9a65b", features = ["nightly", "integrated-timers"] } embedded-graphics = "0.7.1" esp-backtrace = { version = "0.4.0", features = ["esp32c3", "panic-handler", "exception-handler", "print-uart"] } esp-println = { version = "0.3.1", features = ["esp32c3"] } diff --git a/esp32s2-hal/Cargo.toml b/esp32s2-hal/Cargo.toml index bd59c30bbc3..d6b8588cab2 100644 --- a/esp32s2-hal/Cargo.toml +++ b/esp32s2-hal/Cargo.toml @@ -37,7 +37,7 @@ xtensa-atomic-emulation-trap = { version = "0.3.0", features = ["esp32s2"] } [dev-dependencies] critical-section = "1.1.1" -embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "eed34f9", features = ["nightly", "integrated-timers"] } +embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "cd9a65b", features = ["nightly", "integrated-timers"] } embedded-graphics = "0.7.1" esp-backtrace = { version = "0.4.0", features = ["esp32s2", "panic-handler", "print-uart"] } esp-println = { version = "0.3.1", features = ["esp32s2"] } diff --git a/esp32s3-hal/Cargo.toml b/esp32s3-hal/Cargo.toml index 67a3e1ce654..552a2a9ceb4 100644 --- a/esp32s3-hal/Cargo.toml +++ b/esp32s3-hal/Cargo.toml @@ -39,7 +39,7 @@ xtensa-lx-rt = { version = "0.14.0", features = ["esp32s3"], optional = tr [dev-dependencies] critical-section = "1.1.1" -embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "eed34f9", features = ["nightly", "integrated-timers"] } +embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "cd9a65b", features = ["nightly", "integrated-timers"] } embedded-graphics = "0.7.1" esp-backtrace = { version = "0.4.0", features = ["esp32s3", "panic-handler", "exception-handler", "print-uart"] } esp-println = { version = "0.3.1", features = ["esp32s3"] }