From 799d1554ae2b26211158b8a3d4ba758402102ef6 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 9 Apr 2024 18:51:36 +0800 Subject: [PATCH 1/2] chore: CI fixes --- loader/src/platform/cramium/cramium.rs | 2 +- services/graphics-server/src/backend/cramium.rs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/loader/src/platform/cramium/cramium.rs b/loader/src/platform/cramium/cramium.rs index f10390d96..fca223132 100644 --- a/loader/src/platform/cramium/cramium.rs +++ b/loader/src/platform/cramium/cramium.rs @@ -141,7 +141,7 @@ pub fn early_init() { #[cfg(feature = "board-bringup")] { // do a quick TRNG test. - let mut trng = sce::trng::Trng::new(HW_TRNG_BASE); + let mut trng = cramium_hal::sce::trng::Trng::new(HW_TRNG_BASE); trng.setup_raw_generation(256); for _ in 0..8 { crate::println!("trng raw: {:x}", trng.get_u32().unwrap_or(0xDEAD_BEEF)); diff --git a/services/graphics-server/src/backend/cramium.rs b/services/graphics-server/src/backend/cramium.rs index 4739b76e1..0e35841c7 100644 --- a/services/graphics-server/src/backend/cramium.rs +++ b/services/graphics-server/src/backend/cramium.rs @@ -142,6 +142,7 @@ impl XousDisplay { // one extra line for handling the addressing setup (FB_LINES + 1) * FB_WIDTH_WORDS * size_of::(), 0, + None, ) .expect("Couldn't allocate SPI channel for LCD") }; From d0bb39c4ab1b747052151801e74d958f9db19284 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 9 Apr 2024 18:29:38 +0800 Subject: [PATCH 2/2] add debugging to kernel while we work out the issues --- xtask/src/main.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/xtask/src/main.rs b/xtask/src/main.rs index dd3f347ad..ba6b64402 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -255,6 +255,7 @@ fn main() -> Result<(), Box> { builder.add_loader_feature("swap"); builder.add_kernel_feature("swap"); builder.add_kernel_feature("debug-swap"); + builder.add_kernel_feature("debug-print"); // It is important that this is the first service added, because the swapper *must* be in PID 2 builder.add_service("xous-swapper", LoaderRegion::Ram);