mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
add patches to GAM for cramium-soc compatibility
This commit is contained in:
parent
bfef60a0b1
commit
b1e3e81a6f
9 changed files with 30 additions and 6 deletions
|
|
@ -12,11 +12,11 @@ content-plugin-api = { path = "../content-plugin-api" }
|
||||||
graphics-server = { path = "../graphics-server" }
|
graphics-server = { path = "../graphics-server" }
|
||||||
ime-plugin-api = { path = "../ime-plugin-api" }
|
ime-plugin-api = { path = "../ime-plugin-api" }
|
||||||
ime-plugin-shell = { path = "../ime-plugin-shell" }
|
ime-plugin-shell = { path = "../ime-plugin-shell" }
|
||||||
keyboard = { path = "../keyboard" }
|
keyboard = { path = "../keyboard", optional = true }
|
||||||
log = "0.4.14"
|
log = "0.4.14"
|
||||||
log-server = { package = "xous-api-log", version = "0.1.56" }
|
log-server = { package = "xous-api-log", version = "0.1.56" }
|
||||||
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.56" }
|
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.56" }
|
||||||
trng = { path = "../trng" }
|
trng = { path = "../trng", optional = true }
|
||||||
xous = "0.9.60"
|
xous = "0.9.60"
|
||||||
xous-ipc = "0.9.60"
|
xous-ipc = "0.9.60"
|
||||||
xous-names = { package = "xous-api-names", version = "0.9.58" }
|
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",
|
"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.
|
enum_dispatch = "0.3.7" # used for trait-based dispatch off of multiple layout objects.
|
||||||
locales = { path = "../../locales" }
|
locales = { path = "../../locales" }
|
||||||
|
|
@ -46,9 +47,16 @@ digest = "0.9.0"
|
||||||
utralib = { version = "0.1.24", optional = true, default-features = false }
|
utralib = { version = "0.1.24", optional = true, default-features = false }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
precursor = ["utralib/precursor", "sha2/precursor"]
|
precursor = [
|
||||||
hosted = ["utralib/hosted", "sha2/hosted"]
|
"utralib/precursor",
|
||||||
renode = ["utralib/renode", "sha2/renode"]
|
"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 = []
|
debugprint = []
|
||||||
tts = []
|
tts = []
|
||||||
# default = ["debugprint"] # "debugprint"
|
# default = ["debugprint"] # "debugprint"
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,8 @@ use core::cmp::Ordering;
|
||||||
use std::collections::BinaryHeap;
|
use std::collections::BinaryHeap;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
|
#[cfg(feature = "cramium-soc")]
|
||||||
|
use cram_hal_service::trng;
|
||||||
use graphics_server::*;
|
use graphics_server::*;
|
||||||
use log::{error, info};
|
use log::{error, info};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
|
#[cfg(feature = "cramium-soc")]
|
||||||
|
use cram_hal_service::{keyboard, trng};
|
||||||
use enum_dispatch::enum_dispatch;
|
use enum_dispatch::enum_dispatch;
|
||||||
use gam::MAIN_MENU_NAME;
|
use gam::MAIN_MENU_NAME;
|
||||||
use graphics_server::*;
|
use graphics_server::*;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
|
#[cfg(feature = "cramium-soc")]
|
||||||
|
use cram_hal_service::trng;
|
||||||
use graphics_server::*;
|
use graphics_server::*;
|
||||||
|
|
||||||
use crate::contexts::MISC_CONTEXT_DEFAULT_TRUST;
|
use crate::contexts::MISC_CONTEXT_DEFAULT_TRUST;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
|
#[cfg(feature = "cramium-soc")]
|
||||||
|
use cram_hal_service::trng;
|
||||||
use graphics_server::*;
|
use graphics_server::*;
|
||||||
|
|
||||||
use crate::api::CanvasType;
|
use crate::api::CanvasType;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
|
#[cfg(feature = "cramium-soc")]
|
||||||
|
use cram_hal_service::trng;
|
||||||
use graphics_server::*;
|
use graphics_server::*;
|
||||||
|
|
||||||
use crate::contexts::MISC_CONTEXT_DEFAULT_TRUST;
|
use crate::contexts::MISC_CONTEXT_DEFAULT_TRUST;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
|
#[cfg(feature = "cramium-soc")]
|
||||||
|
use cram_hal_service::trng;
|
||||||
use graphics_server::*;
|
use graphics_server::*;
|
||||||
|
|
||||||
use crate::api::CanvasType;
|
use crate::api::CanvasType;
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,8 @@ use core::sync::atomic::{AtomicU32, Ordering};
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
use api::Opcode;
|
use api::Opcode;
|
||||||
|
#[cfg(feature = "cramium-soc")]
|
||||||
|
use cram_hal_service::trng;
|
||||||
use gam::{MAIN_MENU_NAME, ROOTKEY_MODAL_NAME};
|
use gam::{MAIN_MENU_NAME, ROOTKEY_MODAL_NAME};
|
||||||
use graphics_server::*;
|
use graphics_server::*;
|
||||||
use log::info;
|
use log::info;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
|
|
||||||
|
#[cfg(feature = "cramium-soc")]
|
||||||
|
use cram_hal_service::trng;
|
||||||
use gam::{EXPECTED_APP_CONTEXTS, EXPECTED_BOOT_CONTEXTS};
|
use gam::{EXPECTED_APP_CONTEXTS, EXPECTED_BOOT_CONTEXTS};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue