diff --git a/services/gam/Cargo.toml b/services/gam/Cargo.toml index fa89544c2..13bab35cb 100644 --- a/services/gam/Cargo.toml +++ b/services/gam/Cargo.toml @@ -12,11 +12,11 @@ content-plugin-api = { path = "../content-plugin-api" } graphics-server = { path = "../graphics-server" } ime-plugin-api = { path = "../ime-plugin-api" } ime-plugin-shell = { path = "../ime-plugin-shell" } -keyboard = { path = "../keyboard" } +keyboard = { path = "../keyboard", optional = true } log = "0.4.14" log-server = { package = "xous-api-log", version = "0.1.56" } ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.56" } -trng = { path = "../trng" } +trng = { path = "../trng", optional = true } xous = "0.9.60" xous-ipc = "0.9.60" xous-names = { package = "xous-api-names", version = "0.9.58" } @@ -27,7 +27,8 @@ rkyv = { version = "0.4.3", default-features = false, features = [ "const_generics", ] } -susres = { package = "xous-api-susres", version = "0.9.56" } # used for the sleep now menu item +susres = { package = "xous-api-susres", version = "0.9.56", optional = true } # used for the sleep now menu item +cram-hal-service = { path = "../cram-hal-service", optional = true, default_features = false } enum_dispatch = "0.3.7" # used for trait-based dispatch off of multiple layout objects. locales = { path = "../../locales" } @@ -46,9 +47,16 @@ digest = "0.9.0" utralib = { version = "0.1.24", optional = true, default-features = false } [features] -precursor = ["utralib/precursor", "sha2/precursor"] -hosted = ["utralib/hosted", "sha2/hosted"] -renode = ["utralib/renode", "sha2/renode"] +precursor = [ + "utralib/precursor", + "sha2/precursor", + "keyboard", + "trng", + "susres", +] +hosted = ["utralib/hosted", "sha2/hosted", "keyboard", "trng", "susres"] +renode = ["utralib/renode", "sha2/renode", "keyboard", "trng", "susres"] +cramium-soc = ["utralib/cramium-soc", "cram-hal-service"] debugprint = [] tts = [] # default = ["debugprint"] # "debugprint" diff --git a/services/gam/src/canvas.rs b/services/gam/src/canvas.rs index 27f78a948..4f5a128b0 100644 --- a/services/gam/src/canvas.rs +++ b/services/gam/src/canvas.rs @@ -2,6 +2,8 @@ use core::cmp::Ordering; use std::collections::BinaryHeap; use std::collections::HashMap; +#[cfg(feature = "cramium-soc")] +use cram_hal_service::trng; use graphics_server::*; use log::{error, info}; diff --git a/services/gam/src/contexts.rs b/services/gam/src/contexts.rs index 229d7fbd3..7e6f23f33 100644 --- a/services/gam/src/contexts.rs +++ b/services/gam/src/contexts.rs @@ -1,5 +1,7 @@ use std::collections::HashMap; +#[cfg(feature = "cramium-soc")] +use cram_hal_service::{keyboard, trng}; use enum_dispatch::enum_dispatch; use gam::MAIN_MENU_NAME; use graphics_server::*; diff --git a/services/gam/src/layouts/chat.rs b/services/gam/src/layouts/chat.rs index 98aea53c7..7bb869c30 100644 --- a/services/gam/src/layouts/chat.rs +++ b/services/gam/src/layouts/chat.rs @@ -1,5 +1,7 @@ use std::collections::HashMap; +#[cfg(feature = "cramium-soc")] +use cram_hal_service::trng; use graphics_server::*; use crate::contexts::MISC_CONTEXT_DEFAULT_TRUST; diff --git a/services/gam/src/layouts/framebuffer.rs b/services/gam/src/layouts/framebuffer.rs index ca6d72f95..496828355 100644 --- a/services/gam/src/layouts/framebuffer.rs +++ b/services/gam/src/layouts/framebuffer.rs @@ -1,5 +1,7 @@ use std::collections::HashMap; +#[cfg(feature = "cramium-soc")] +use cram_hal_service::trng; use graphics_server::*; use crate::api::CanvasType; diff --git a/services/gam/src/layouts/menu.rs b/services/gam/src/layouts/menu.rs index 0ef057c7d..0fd74189f 100644 --- a/services/gam/src/layouts/menu.rs +++ b/services/gam/src/layouts/menu.rs @@ -1,5 +1,7 @@ use std::collections::HashMap; +#[cfg(feature = "cramium-soc")] +use cram_hal_service::trng; use graphics_server::*; use crate::contexts::MISC_CONTEXT_DEFAULT_TRUST; diff --git a/services/gam/src/layouts/modal.rs b/services/gam/src/layouts/modal.rs index 9aec76ae9..d95d822f4 100644 --- a/services/gam/src/layouts/modal.rs +++ b/services/gam/src/layouts/modal.rs @@ -1,5 +1,7 @@ use std::collections::HashMap; +#[cfg(feature = "cramium-soc")] +use cram_hal_service::trng; use graphics_server::*; use crate::api::CanvasType; diff --git a/services/gam/src/main.rs b/services/gam/src/main.rs index 9e0d83ebf..fbfd98b2f 100644 --- a/services/gam/src/main.rs +++ b/services/gam/src/main.rs @@ -18,6 +18,8 @@ use core::sync::atomic::{AtomicU32, Ordering}; use std::collections::HashMap; use api::Opcode; +#[cfg(feature = "cramium-soc")] +use cram_hal_service::trng; use gam::{MAIN_MENU_NAME, ROOTKEY_MODAL_NAME}; use graphics_server::*; use log::info; diff --git a/services/gam/src/tokens.rs b/services/gam/src/tokens.rs index 9ed40ffbb..9d47941ed 100644 --- a/services/gam/src/tokens.rs +++ b/services/gam/src/tokens.rs @@ -1,5 +1,7 @@ use std::cell::RefCell; +#[cfg(feature = "cramium-soc")] +use cram_hal_service::trng; use gam::{EXPECTED_APP_CONTEXTS, EXPECTED_BOOT_CONTEXTS}; /*