From fd6c2ad4ffb8a7c09d88101c690ccaab93f031d2 Mon Sep 17 00:00:00 2001 From: bunnie Date: Thu, 7 Nov 2024 16:13:08 +0800 Subject: [PATCH] shuffle around package order There's a hardware bug that makes concurrent camera and SPIM traffic unreliable. The work-around is to place the camera code inside the XIP area so we don't have to hit SPIM to swap in code while the camera is running. However, we do need to figure out a more reliable fix for this. --- xtask/src/main.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xtask/src/main.rs b/xtask/src/main.rs index b2a46731b..a4dd5a2e6 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -566,8 +566,9 @@ fn main() -> Result<(), Box> { // - bao-console is the serial debug console handler // - [planned] pddb server // - [planned] vault application - let bao_rram_pkgs = ["xous-ticktimer", "xous-log", "xous-names", "usb-cramium"].to_vec(); - let bao_swap_pkgs = ["bao-video", "cram-hal-service", "bao-console"].to_vec(); + let bao_rram_pkgs = + ["xous-ticktimer", "xous-log", "xous-names", "usb-cramium", "bao-video"].to_vec(); + let bao_swap_pkgs = ["cram-hal-service", "bao-console"].to_vec(); if !builder.is_swap_set() { builder.set_swap(0, 8 * 1024 * 1024); } @@ -577,6 +578,8 @@ fn main() -> Result<(), Box> { builder.add_loader_feature("debug-print"); builder.add_kernel_feature("debug-swap"); + // builder.add_kernel_feature("debug-print"); + // builder.add_kernel_feature("debug-swap-verbose"); builder.add_feature("quantum-timer"); builder.add_kernel_feature("v2p"); builder.add_loader_feature("sram-margin");