From 857c5875fe1afaa7c0f025b915a3880d1728d523 Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 24 Oct 2025 21:13:18 +0800 Subject: [PATCH] move the keystore to the appointed slot for access to secure regions --- xtask/src/main.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xtask/src/main.rs b/xtask/src/main.rs index ae1686708..a7a3f84ec 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -684,7 +684,6 @@ fn main() -> Result<(), Box> { "xous-ticktimer", "xous-log", "xous-names", - "keystore", "usb-bao1x", "bao1x-hal-service", "bao-console", @@ -723,6 +722,9 @@ fn main() -> Result<(), Box> { // It is important that this is the first service added, because the swapper *must* be in PID 2 builder.add_service("xous-swapper", LoaderRegion::Flash); + // It is important that this is the second service added, as keystore *must* be in PID 3 + // (as constrained by the coreuser setting that is locked out by the time Xous runs) + builder.add_service("keystore", LoaderRegion::Flash); for service in bao_rram_pkgs { builder.add_service(service, LoaderRegion::Flash);