Merge pull request #713 from betrusted-io/app2apps

Rename 'app.uf2' to 'apps.uf2'
This commit is contained in:
bunnie 2025-11-01 02:57:08 +08:00 committed by GitHub
commit 23f8534d87
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions

View file

@ -52,7 +52,7 @@ def main():
# flash # flash
f = sub.add_parser("flash", help="Copy UF2 file(s) to a mounted drive") 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("--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) f.set_defaults(func=cmd_flash)
args = ap.parse_args() args = ap.parse_args()

View file

@ -2,14 +2,14 @@
Return release UF2 images for flashing. Return release UF2 images for flashing.
Scans the release directory for UF2 images: Scans the release directory for UF2 images:
<xous-core>/target/riscv32imac-unknown-xous-elf/release/{loader.uf2,xous.uf2,app.uf2} <xous-core>/target/riscv32imac-unknown-xous-elf/release/{loader.uf2,xous.uf2,apps.uf2}
Outputs JSON if --json is set: Outputs JSON if --json is set:
{ {
"images": [ "images": [
{ "path": ".../loader.uf2", "role": "loader" }, { "path": ".../loader.uf2", "role": "loader" },
{ "path": ".../xous.uf2", "role": "xous" }, { "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]] = [ FILENAMES: List[Tuple[str, str]] = [
("loader.uf2", "loader"), ("loader.uf2", "loader"),
("xous.uf2", "xous"), ("xous.uf2", "xous"),
("app.uf2", "app"), ("apps.uf2", "app"),
] ]
EXIT_OK = 0 EXIT_OK = 0

View file

@ -1303,7 +1303,7 @@ impl Builder {
} }
let mut app_img_path = output_file.parent().unwrap().to_owned(); 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()) Command::new(cargo())
.current_dir(project_root()) .current_dir(project_root())