From 0e399e62644870586fd0a9000e5b503529b865ae Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 31 Oct 2025 11:27:42 +0800 Subject: [PATCH 1/2] rename detached-app partition to "apps.uf2" Per @rowr111 suggestion to make it less confusing in that the app partition can in fact contain more than one app. --- xtask/src/builder.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xtask/src/builder.rs b/xtask/src/builder.rs index f6d92aa98..78c074c6e 100644 --- a/xtask/src/builder.rs +++ b/xtask/src/builder.rs @@ -1303,7 +1303,7 @@ impl Builder { } let mut app_img_path = output_file.parent().unwrap().to_owned(); - app_img_path.push("app.img"); + app_img_path.push("apps.img"); Command::new(cargo()) .current_dir(project_root()) From be274c7070a9f48dcfa1263ebfb7c1c6f637a2e8 Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 31 Oct 2025 11:28:26 +0800 Subject: [PATCH 2/2] fixup side effects of renaming app partition I think these are the spots that are impacted by the naming change. --- tools-bao/bao.py | 2 +- tools-bao/commands/artifacts.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools-bao/bao.py b/tools-bao/bao.py index 222c1f263..9f63cb053 100644 --- a/tools-bao/bao.py +++ b/tools-bao/bao.py @@ -52,7 +52,7 @@ def main(): # flash f = sub.add_parser("flash", help="Copy UF2 file(s) to a mounted drive") f.add_argument("--dest", required=True, help="Mount path of the UF2 boot drive (e.g., D:\\)") - f.add_argument("files", nargs="+", help="One or more UF2 files to copy (e.g., loader.uf2 xous.uf2 app.uf2)") + f.add_argument("files", nargs="+", help="One or more UF2 files to copy (e.g., loader.uf2 xous.uf2 apps.uf2)") f.set_defaults(func=cmd_flash) args = ap.parse_args() diff --git a/tools-bao/commands/artifacts.py b/tools-bao/commands/artifacts.py index 32d415951..380b34745 100644 --- a/tools-bao/commands/artifacts.py +++ b/tools-bao/commands/artifacts.py @@ -2,14 +2,14 @@ Return release UF2 images for flashing. Scans the release directory for UF2 images: - /target/riscv32imac-unknown-xous-elf/release/{loader.uf2,xous.uf2,app.uf2} + /target/riscv32imac-unknown-xous-elf/release/{loader.uf2,xous.uf2,apps.uf2} Outputs JSON if --json is set: { "images": [ { "path": ".../loader.uf2", "role": "loader" }, { "path": ".../xous.uf2", "role": "xous" }, - { "path": ".../app.uf2", "role": "app" } + { "path": ".../apps.uf2", "role": "app" } ] } @@ -26,7 +26,7 @@ TRIPLE: str = "riscv32imac-unknown-xous-elf" FILENAMES: List[Tuple[str, str]] = [ ("loader.uf2", "loader"), ("xous.uf2", "xous"), - ("app.uf2", "app"), + ("apps.uf2", "app"), ] EXIT_OK = 0