Skip to content

support esp-mbedtls for esp32c6 #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,17 @@ rustflags = [
"-C", "force-frame-pointers",
]

[target.riscv32imac-unknown-none-elf]
runner = "espflash flash --monitor --baud 921600"

rustflags = [
"-C", "link-arg=-Tlinkall.x",

# Required to obtain backtraces (e.g. when using the "esp-backtrace" crate.)
# NOTE: May negatively impact performance of produced code
"-C", "force-frame-pointers",
]

[target.xtensa-esp32s2-none-elf]
runner = "espflash flash --monitor --baud 921600"

Expand Down Expand Up @@ -69,8 +80,10 @@ esp32 = "run --release --features esp32 --target xtensa-esp32-none-elf
esp32s2 = "run --release --features esp32s2 --target xtensa-esp32s2-none-elf --features esp-hal/default"
esp32s3 = "run --release --features esp32s3 --target xtensa-esp32s3-none-elf --features esp-hal/default"
esp32c3 = "run --release --features esp32c3 --target riscv32imc-unknown-none-elf --features esp-hal/default"
esp32c6 = "run --release --features esp32c6 --target riscv32imac-unknown-none-elf --features esp-hal/default"

besp32 = "build --release --features esp32 --target xtensa-esp32-none-elf --features esp-hal/default"
besp32s2 = "build --release --features esp32s2 --target xtensa-esp32s2-none-elf --features esp-hal/default"
besp32s3 = "build --release --features esp32s3 --target xtensa-esp32s3-none-elf --features esp-hal/default"
besp32c3 = "build --release --features esp32c3 --target riscv32imc-unknown-none-elf --features esp-hal/default"
besp32c6 = "build --release --features esp32c6 --target riscv32imac-unknown-none-elf --features esp-hal/default"
8 changes: 8 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,14 @@ esp32c3 = [
"esp-wifi?/esp32c3",
"esp-mbedtls/esp32c3",
]
esp32c6 = [
"esp-hal?/esp32c6",
"esp-hal-embassy?/esp32c6",
"esp-backtrace?/esp32c6",
"esp-println?/esp32c6",
"esp-wifi?/esp32c6",
"esp-mbedtls/esp32c6",
]
esp32s2 = [
"esp-hal?/esp32s2",
"esp-hal-embassy?/esp32s2",
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Examples are available for:

- esp32
- esp32c3
- esp32c6
- esp32s2
- esp32s3

Expand Down Expand Up @@ -53,6 +54,7 @@ Here's a table of the architectures with their corresponding target for quick re
| ------------ | --------------------------- | ------------------ |
| esp32 | xtensa-esp32-none-elf | esp |
| esp32c3 | riscv32imc-unknown-none-elf | nightly |
| esp32c6 | riscv32imac-unknown-none-elf| nightly |
| esp32s2 | xtensa-esp32s2-none-elf | esp |
| esp32s3 | xtensa-esp32s3-none-elf | esp |

Expand Down
1 change: 1 addition & 0 deletions esp-mbedtls-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@ default = []
# ESP-HAL: Exactly *one* chip MUST be selected via its feature:
esp32 = ["esp-wifi/esp32"]
esp32c3 = ["esp-wifi/esp32c3"]
esp32c6 = ["esp-wifi/esp32c6"]
esp32s2 = ["esp-wifi/esp32s2"]
esp32s3 = ["esp-wifi/esp32s3"]
8 changes: 7 additions & 1 deletion esp-mbedtls-sys/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@ fn main() -> Result<()> {
// and just use the pre-generated baremetal ESP bindings and libraries
let esp32 = env::var("CARGO_FEATURE_ESP32").is_ok();
let esp32c3 = env::var("CARGO_FEATURE_ESP32C3").is_ok();
let esp32c6 = env::var("CARGO_FEATURE_ESP32C6").is_ok();
let esp32s2 = env::var("CARGO_FEATURE_ESP32S2").is_ok();
let esp32s3 = env::var("CARGO_FEATURE_ESP32S3").is_ok();

let host = env::var("HOST").unwrap();
let target = env::var("TARGET").unwrap();

// If we're building for ESP32, ESP32C3, ESP32S2, or ESP32S3, we don't need to do anything
// If we're building for ESP32, ESP32C3, ESP32C6, ESP32S2, or ESP32S3, we don't need to do anything
// Just link against the pre-built libraries and use the pre-generated bindings
let bindings_dir = crate_root_path.join("src").join("include");
let libs_dir = crate_root_path.join("libs");
Expand All @@ -36,6 +37,11 @@ fn main() -> Result<()> {
bindings_dir.join("esp32c3.rs"),
libs_dir.join("riscv32imc-unknown-none-elf"),
))
} else if esp32c6 {
Some((
bindings_dir.join("esp32c6.rs"),
libs_dir.join("riscv32imac-unknown-none-elf"),
))
} else if esp32s2 {
Some((
bindings_dir.join("esp32s2.rs"),
Expand Down
Loading
Loading