From 34ca298698b9450fbf76737cafa610718e0c3f3b Mon Sep 17 00:00:00 2001 From: Jesse Braham Date: Thu, 6 Jan 2022 08:19:28 -0800 Subject: [PATCH] Update each package's Cargo manifest --- esp-hal-common/Cargo.toml | 13 ++++++++--- esp32-hal/Cargo.toml | 40 +++++++++++++++++++++++++--------- esp32c3-hal/Cargo.toml | 46 ++++++++++++++++++++++++++++----------- esp32s2-hal/Cargo.toml | 42 +++++++++++++++++++++++++---------- esp32s3-hal/Cargo.toml | 42 +++++++++++++++++++++++++---------- 5 files changed, 135 insertions(+), 48 deletions(-) diff --git a/esp-hal-common/Cargo.toml b/esp-hal-common/Cargo.toml index 52ed4433f..25417978f 100644 --- a/esp-hal-common/Cargo.toml +++ b/esp-hal-common/Cargo.toml @@ -1,19 +1,26 @@ [package] name = "esp-hal-common" version = "0.1.0" -edition = "2018" +authors = [ + "Jesse Braham ", + "Björn Quentin ", +] +edition = "2021" +description = "HAL implementations for peripherals common among Espressif devices; should not be used directly" +repository = "https://github.com/esp-rs/esp-hal" +license = "MIT OR Apache-2.0" [dependencies] -paste = "1.0.6" embedded-hal = { version = "0.2", features = ["unproven"] } nb = "1.0" +paste = "1.0" riscv = { version = "0.7", optional = true } void = { version = "1.0", default-features = false } xtensa-lx = { version = "0.4", optional = true } # IMPORTANT: # Each supported device MUST have its PAC included below along with a # corresponding feature. -esp32_pac = { package = "esp32", git = "https://github.com/jessebraham/esp32.git", branch = "develop", optional = true } +esp32_pac = { package = "esp32", git = "https://github.com/jessebraham/esp32.git", branch = "develop", optional = true } esp32c3_pac = { package = "esp32c3", git = "https://github.com/jessebraham/esp32c3.git", branch = "develop", optional = true } esp32s2_pac = { package = "esp32s2", git = "https://github.com/jessebraham/esp32s2.git", branch = "develop", optional = true } esp32s3_pac = { package = "esp32s3", git = "https://github.com/jessebraham/esp32s3.git", branch = "develop", optional = true } diff --git a/esp32-hal/Cargo.toml b/esp32-hal/Cargo.toml index a827654f4..6379d2e4f 100644 --- a/esp32-hal/Cargo.toml +++ b/esp32-hal/Cargo.toml @@ -1,22 +1,42 @@ [package] -name = "esp32-hal" +name = "esp32-hal" version = "0.1.0" -edition = "2018" +authors = [ + "Jesse Braham ", + "Björn Quentin ", +] +edition = "2021" +description = "HAL for ESP32 microcontrollers" +repository = "https://github.com/esp-rs/esp-hal" +license = "MIT OR Apache-2.0" + +keywords = [ + "embedded", + "embedded-hal", + "esp", + "esp32", + "no-std", +] +categories = [ + "embedded", + "hardware-support", + "no-std", +] [dependencies] -bare-metal = "1.0" +bare-metal = "1.0" embedded-hal = { version = "0.2", features = ["unproven"] } -nb = "1.0" -void = { version = "1.0", default-features = false } -xtensa-lx = { version = "0.4", features = ["lx6"] } +nb = "1.0" +void = { version = "1.0", default-features = false } +xtensa-lx = { version = "0.4", features = ["lx6"] } [dependencies.esp-hal-common] -path = "../esp-hal-common" +path = "../esp-hal-common" features = ["esp32"] [dependencies.xtensa-lx-rt] -git = "https://github.com/esp-rs/xtensa-lx-rt/" -branch = "unify-xtensa-asm" +git = "https://github.com/esp-rs/xtensa-lx-rt/" +branch = "unify-xtensa-asm" features = ["lx6"] optional = true @@ -25,4 +45,4 @@ panic-halt = "0.2" [features] default = ["rt"] -rt = ["xtensa-lx-rt"] +rt = ["xtensa-lx-rt"] diff --git a/esp32c3-hal/Cargo.toml b/esp32c3-hal/Cargo.toml index e9dd53bd1..ce640c879 100644 --- a/esp32c3-hal/Cargo.toml +++ b/esp32c3-hal/Cargo.toml @@ -1,22 +1,45 @@ [package] -name = "esp32c3-hal" +name = "esp32c3-hal" version = "0.1.0" -edition = "2018" +authors = [ + "Jesse Braham ", + "Björn Quentin ", +] +edition = "2021" +description = "HAL for ESP32-C3 microcontrollers" +repository = "https://github.com/esp-rs/esp-hal" +license = "MIT OR Apache-2.0" + +keywords = [ + "embedded", + "embedded-hal", + "esp", + "esp32c3", + "no-std", +] +categories = [ + "embedded", + "hardware-support", + "no-std", +] + +[package.metadata.espflash] +format = "direct-boot" [dependencies] -bare-metal = "1.0" +bare-metal = "1.0" embedded-hal = { version = "0.2", features = ["unproven"] } -nb = "1.0" -riscv = "0.7" -void = { version = "1.0", default-features = false } +nb = "1.0" +riscv = "0.7" +void = { version = "1.0", default-features = false } [dependencies.esp-hal-common] -path = "../esp-hal-common" +path = "../esp-hal-common" features = ["esp32c3"] [dependencies.riscv-rt] -git = "https://github.com/MabezDev/riscv-rt" -rev = "6b55e4aa3895924e31bcd151f2f0ab840836fa07" +git = "https://github.com/MabezDev/riscv-rt" +rev = "6b55e4aa3895924e31bcd151f2f0ab840836fa07" optional = true [dev-dependencies] @@ -24,7 +47,4 @@ panic-halt = "0.2" [features] default = ["rt"] -rt = ["riscv-rt"] - -[package.metadata.espflash] -format = "direct-boot" +rt = ["riscv-rt"] diff --git a/esp32s2-hal/Cargo.toml b/esp32s2-hal/Cargo.toml index adeff17ca..fba3c5ce4 100644 --- a/esp32s2-hal/Cargo.toml +++ b/esp32s2-hal/Cargo.toml @@ -1,22 +1,42 @@ [package] -name = "esp32s2-hal" +name = "esp32s2-hal" version = "0.1.0" -edition = "2018" +authors = [ + "Jesse Braham ", + "Björn Quentin ", +] +edition = "2021" +description = "HAL for ESP32-S2 microcontrollers" +repository = "https://github.com/esp-rs/esp-hal" +license = "MIT OR Apache-2.0" + +keywords = [ + "embedded", + "embedded-hal", + "esp", + "esp32s2", + "no-std", +] +categories = [ + "embedded", + "hardware-support", + "no-std", +] [dependencies] -bare-metal = "1.0" +bare-metal = "1.0" embedded-hal = { version = "0.2", features = ["unproven"] } -nb = "1.0" -void = { version = "1.0", default-features = false } -xtensa-lx = { version = "0.4", features = ["lx6"] } # FIXME +nb = "1.0" +void = { version = "1.0", default-features = false } +xtensa-lx = { version = "0.4", features = ["lx6"] } # FIXME [dependencies.esp-hal-common] -path = "../esp-hal-common" +path = "../esp-hal-common" features = ["esp32s2"] -[dependencies.xtensa-lx-rt] -git = "https://github.com/esp-rs/xtensa-lx-rt/" -branch = "unify-xtensa-asm" +[dependencies.xtensa-lx-rt] # FIXME +git = "https://github.com/esp-rs/xtensa-lx-rt/" +branch = "unify-xtensa-asm" features = ["lx6"] optional = true @@ -25,4 +45,4 @@ panic-halt = "0.2" [features] default = ["rt"] -rt = ["xtensa-lx-rt"] +rt = ["xtensa-lx-rt"] diff --git a/esp32s3-hal/Cargo.toml b/esp32s3-hal/Cargo.toml index 5d3c0abf7..356082113 100644 --- a/esp32s3-hal/Cargo.toml +++ b/esp32s3-hal/Cargo.toml @@ -1,22 +1,42 @@ [package] -name = "esp32s3-hal" +name = "esp32s3-hal" version = "0.1.0" -edition = "2018" +authors = [ + "Jesse Braham ", + "Björn Quentin ", +] +edition = "2021" +description = "HAL for ESP32-S3 microcontrollers" +repository = "https://github.com/esp-rs/esp-hal" +license = "MIT OR Apache-2.0" + +keywords = [ + "embedded", + "embedded-hal", + "esp", + "esp32s3", + "no-std", +] +categories = [ + "embedded", + "hardware-support", + "no-std", +] [dependencies] -bare-metal = "1.0" +bare-metal = "1.0" embedded-hal = { version = "0.2", features = ["unproven"] } -nb = "1.0" -void = { version = "1.0", default-features = false } -xtensa-lx = { version = "0.4", features = ["lx6"] } # FIXME +nb = "1.0" +void = { version = "1.0", default-features = false } +xtensa-lx = { version = "0.4", features = ["lx6"] } # FIXME [dependencies.esp-hal-common] -path = "../esp-hal-common" +path = "../esp-hal-common" features = ["esp32s3"] -[dependencies.xtensa-lx-rt] -git = "https://github.com/esp-rs/xtensa-lx-rt/" -branch = "unify-xtensa-asm" +[dependencies.xtensa-lx-rt] # FIXME +git = "https://github.com/esp-rs/xtensa-lx-rt/" +branch = "unify-xtensa-asm" features = ["lx6"] optional = true @@ -25,4 +45,4 @@ panic-halt = "0.2" [features] default = ["rt"] -rt = ["xtensa-lx-rt"] +rt = ["xtensa-lx-rt"]