From b8a088dc78c9158399168daf484a8792af28a957 Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 6 May 2024 03:33:06 +0800 Subject: [PATCH] commit latest test config - swap works on hardware (at least reading in the encrypted images works) - renode version is deliberately configured to trigger an edge case in the swapper, and is broken -- to be debugged --- xtask/src/main.rs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 1a23f83ba..c9cf0ec7c 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -270,7 +270,7 @@ fn main() -> Result<(), Box> { builder.add_loader_feature("renode-bypass"); } Some("renode-swap") => { - let swap_pkgs = ["xous-ticktimer", "xous-log", "xous-names", "xous-susres"]; + let swap_pkgs = ["xous-ticktimer", "xous-log", "xous-susres", "xous-names"]; if !builder.is_swap_set() { builder.set_swap(0x4080_0000, 8 * 1024 * 1024); } @@ -291,7 +291,9 @@ fn main() -> Result<(), Box> { builder.add_service(service, LoaderRegion::Flash); } builder.add_service("test-swapper", LoaderRegion::Swap); // when we implement loaded-but-swapped, use that instead - builder.add_apps(&get_cratespecs()); + builder.add_service("graphics-server", LoaderRegion::Swap); + builder.add_service("trng", LoaderRegion::Swap); + builder.add_apps(get_cratespecs()); } // ------- hosted mode configs ------- @@ -466,19 +468,19 @@ fn main() -> Result<(), Box> { // ------ Cramium hardware image configs ------ Some("cramium-fpga") | Some("cramium-soc") => { let cramium_flash_pkgs = - ["xous-log", "xous-names", "xous-ticktimer", "cram-hal-service"].to_vec(); - let cramium_swap_pkgs = ["graphics-server", "cram-console", "test-swapper"].to_vec(); + ["xous-ticktimer", "xous-log", "xous-names", "cram-hal-service", "cram-console"].to_vec(); + let cramium_swap_pkgs = ["test-swapper", "graphics-server"].to_vec(); if !builder.is_swap_set() { builder.set_swap(0, 4 * 1024 * 1024); } - builder.add_loader_feature("board-bringup"); - builder.add_loader_feature("spim-test"); + // builder.add_loader_feature("board-bringup"); + // builder.add_loader_feature("spim-test"); // builder.add_loader_feature("spi-alt-channel"); // this flag, when asserted, uses the J_QSPI // header. By default, we use JPC7_13 (J_QSPI does not work, for some reason; bit 3 is stuck // high...) builder.add_loader_feature("debug-print"); builder.add_loader_feature("swap"); - builder.add_kernel_feature("debug-print"); + // builder.add_kernel_feature("debug-print"); builder.add_kernel_feature("debug-swap"); builder.add_kernel_feature("swap"); builder.add_feature("swap");