work around dependency conflict on atsma5d27

the dependency is pinned to an old version of utralib that
causes a build conflict...
This commit is contained in:
bunnie 2024-02-08 00:33:14 +08:00
parent 315d9b96d4
commit 717abf4af8
3 changed files with 10 additions and 10 deletions

2
Cargo.lock generated
View file

@ -6307,7 +6307,6 @@ name = "xous-kernel"
version = "0.9.38" version = "0.9.38"
dependencies = [ dependencies = [
"armv7", "armv7",
"atsama5d27",
"bitflags 1.3.2", "bitflags 1.3.2",
"cramium-hal", "cramium-hal",
"critical-section", "critical-section",
@ -6328,7 +6327,6 @@ dependencies = [
name = "xous-log" name = "xous-log"
version = "0.1.28" version = "0.1.28"
dependencies = [ dependencies = [
"atsama5d27",
"cramium-hal", "cramium-hal",
"log", "log",
"num-derive 0.3.3", "num-derive 0.3.3",

View file

@ -33,7 +33,8 @@ gdbstub_arch = { version = "0.2.4", optional = true, default-features = false }
armv7 = { git = "https://github.com/Foundation-Devices/armv7.git", branch = "update", features = [ armv7 = { git = "https://github.com/Foundation-Devices/armv7.git", branch = "update", features = [
"critical-section", "critical-section",
] } ] }
atsama5d27 = { git = "https://github.com/Foundation-Devices/atsama5d27.git", branch = "master" } # FIXME: bring atsama5d27 target up to date so utralib dependency does not conflict
# atsama5d27 = { git = "https://github.com/Foundation-Devices/atsama5d27.git", branch = "master" }
xous-kernel = { package = "xous", version = "0.9.58", features = ["v2p"] } xous-kernel = { package = "xous", version = "0.9.58", features = ["v2p"] }
critical-section = "1.1.1" critical-section = "1.1.1"

View file

@ -28,13 +28,14 @@ cramium-hal = { path = "../../libs/cramium-hal", optional = true, default-featur
"std", "std",
] } ] }
[target.'cfg(target_arch = "arm")'.dependencies] # FIXME: bring atsama5d27 target up to date so utralib dependency does not conflict
atsama5d27 = { git = "https://github.com/Foundation-Devices/atsama5d27.git", branch = "master", features = [ # [target.'cfg(target_arch = "arm")'.dependencies]
"lcd-console", # atsama5d27 = { git = "https://github.com/Foundation-Devices/atsama5d27.git", branch = "master", features = [
] } # "lcd-console",
xous = { version = "0.9.58", features = [ # ] }
"v2p", # xous = { version = "0.9.58", features = [
] } # v2p feature is used when lcd-console feature is turned on # "v2p",
# ] } # v2p feature is used when lcd-console feature is turned on
[features] [features]
cramium-soc = ["utralib/cramium-soc", "cramium-hal"] cramium-soc = ["utralib/cramium-soc", "cramium-hal"]