Merge remote-tracking branch 'upstream/main' into tools-bao_apps-name-change-and-send-boot-cmd

This commit is contained in:
Jeanie 2025-11-01 04:00:39 +09:00
commit e75013af43
2 changed files with 2 additions and 2 deletions

View file

@ -26,7 +26,7 @@ TRIPLE: str = "riscv32imac-unknown-xous-elf"
FILENAMES: List[Tuple[str, str]] = [
("loader.uf2", "loader"),
("xous.uf2", "xous"),
("apps.uf2", "apps"),
("app.uf2", "app"),
]
EXIT_OK = 0

View file

@ -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())