From 717abf4af81db100b365c51723adddcd07f2db11 Mon Sep 17 00:00:00 2001 From: bunnie Date: Thu, 8 Feb 2024 00:33:14 +0800 Subject: [PATCH] work around dependency conflict on atsma5d27 the dependency is pinned to an old version of utralib that causes a build conflict... --- Cargo.lock | 2 -- kernel/Cargo.toml | 3 ++- services/xous-log/Cargo.toml | 15 ++++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3fff61b1c..8a8f4e14f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6307,7 +6307,6 @@ name = "xous-kernel" version = "0.9.38" dependencies = [ "armv7", - "atsama5d27", "bitflags 1.3.2", "cramium-hal", "critical-section", @@ -6328,7 +6327,6 @@ dependencies = [ name = "xous-log" version = "0.1.28" dependencies = [ - "atsama5d27", "cramium-hal", "log", "num-derive 0.3.3", diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 0a1950c85..825fd7cbd 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -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 = [ "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"] } critical-section = "1.1.1" diff --git a/services/xous-log/Cargo.toml b/services/xous-log/Cargo.toml index 5397fcb6e..d2ce94aac 100644 --- a/services/xous-log/Cargo.toml +++ b/services/xous-log/Cargo.toml @@ -28,13 +28,14 @@ cramium-hal = { path = "../../libs/cramium-hal", optional = true, default-featur "std", ] } -[target.'cfg(target_arch = "arm")'.dependencies] -atsama5d27 = { git = "https://github.com/Foundation-Devices/atsama5d27.git", branch = "master", features = [ - "lcd-console", -] } -xous = { version = "0.9.58", features = [ - "v2p", -] } # v2p feature is used when lcd-console feature is turned on +# FIXME: bring atsama5d27 target up to date so utralib dependency does not conflict +# [target.'cfg(target_arch = "arm")'.dependencies] +# atsama5d27 = { git = "https://github.com/Foundation-Devices/atsama5d27.git", branch = "master", features = [ +# "lcd-console", +# ] } +# xous = { version = "0.9.58", features = [ +# "v2p", +# ] } # v2p feature is used when lcd-console feature is turned on [features] cramium-soc = ["utralib/cramium-soc", "cramium-hal"]