Use esp-rs/esp-pacs

This commit is contained in:
bjoernQ 2022-02-10 10:03:37 +01:00
parent cac30b7544
commit 52f388e9a1
4 changed files with 15 additions and 25 deletions

View File

@ -16,22 +16,22 @@ 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 }
xtensa-lx-rt = { version = "0.7", features = ["lx6"], optional = true }
xtensa-lx = { version = "0.6.0", optional = true }
xtensa-lx-rt = { version = "0.8.0", features = ["esp32"], optional = true }
procmacros = { path = "../esp-hal-procmacros", package = "esp-hal-procmacros" }
# 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 }
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 }
esp32_pac = { package = "esp32", git = "https://github.com/esp-rs/esp-pacs.git", branch = "with_source", optional = true }
esp32c3_pac = { package = "esp32c3", git = "https://github.com/esp-rs/esp-pacs.git", branch = "with_source", optional = true }
esp32s2_pac = { package = "esp32s2", git = "https://github.com/esp-rs/esp-pacs.git", branch = "with_source", optional = true }
esp32s3_pac = { package = "esp32s3", git = "https://github.com/esp-rs/esp-pacs.git", branch = "with_source", optional = true }
[features]
esp32 = ["esp32_pac", "esp32_pac/rt", "xtensa-lx/lx6", "xtensa-lx-rt/lx6", "procmacros/rtc_slow", "dual_core"]
esp32 = ["esp32_pac", "esp32_pac/rt", "xtensa-lx/esp32", "xtensa-lx-rt/esp32", "procmacros/rtc_slow", "dual_core"]
esp32c3 = ["esp32c3_pac", "esp32c3_pac/rt", "riscv", "single_core"]
esp32s2 = ["esp32s2_pac", "esp32s2_pac/rt", "xtensa-lx/lx6", "xtensa-lx-rt/lx6", "procmacros/rtc_slow", "single_core"] # FIXME
esp32s3 = ["esp32s3_pac", "esp32s3_pac/rt", "xtensa-lx/lx6", "xtensa-lx-rt/lx6", "procmacros/rtc_slow", "dual_core"] # FIXME
esp32s2 = ["esp32s2_pac", "esp32s2_pac/rt", "xtensa-lx/esp32", "xtensa-lx-rt/esp32", "procmacros/rtc_slow", "single_core"] # FIXME
esp32s3 = ["esp32s3_pac", "esp32s3_pac/rt", "xtensa-lx/esp32", "xtensa-lx-rt/esp32", "procmacros/rtc_slow", "dual_core"] # FIXME
single_core = []
dual_core = []

View File

@ -28,8 +28,8 @@ 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"] }
xtensa-lx-rt = { version = "0.7", features = ["lx6"], optional = true }
xtensa-lx = { version = "0.6.0", features = ["esp32"] }
xtensa-lx-rt = { version = "0.8.0", features = ["esp32"], optional = true }
[dependencies.esp-hal-common]
path = "../esp-hal-common"

View File

@ -28,18 +28,13 @@ 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
xtensa-lx = { version = "0.6.0", features = ["esp32"] } # FIXME
xtensa-lx-rt = { version = "0.8.0", features = ["esp32"], optional = true }
[dependencies.esp-hal-common]
path = "../esp-hal-common"
features = ["esp32s2"]
[dependencies.xtensa-lx-rt] # FIXME
git = "https://github.com/esp-rs/xtensa-lx-rt/"
branch = "unify-xtensa-asm"
features = ["lx6"]
optional = true
[dev-dependencies]
panic-halt = "0.2"

View File

@ -28,18 +28,13 @@ 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
xtensa-lx = { version = "0.6.0", features = ["esp32"] } # FIXME
xtensa-lx-rt = { version = "0.8.0", features = ["esp32"], optional = true }
[dependencies.esp-hal-common]
path = "../esp-hal-common"
features = ["esp32s3"]
[dependencies.xtensa-lx-rt] # FIXME
git = "https://github.com/esp-rs/xtensa-lx-rt/"
branch = "unify-xtensa-asm"
features = ["lx6"]
optional = true
[dev-dependencies]
panic-halt = "0.2"