add targets for boot0

This commit is contained in:
bunnie 2025-09-24 01:04:31 +08:00
parent 26fefa7e5b
commit c117d8020e
2 changed files with 10 additions and 5 deletions

View file

@ -367,13 +367,13 @@ impl Builder {
} }
/// Configure for baremetal bringup /// Configure for baremetal bringup
pub fn target_baremetal_bao1x(&mut self) -> &mut Builder { pub fn target_baremetal_bao1x(&mut self, subtype: &str) -> &mut Builder {
self.target = Some(crate::TARGET_TRIPLE_RISCV32.to_string()); self.target = Some(crate::TARGET_TRIPLE_RISCV32.to_string());
self.target_kernel = Some(crate::TARGET_TRIPLE_RISCV32_KERNEL.to_string()); self.target_kernel = Some(crate::TARGET_TRIPLE_RISCV32_KERNEL.to_string());
self.stream = BuildStream::Release; self.stream = BuildStream::Release;
self.utra_target = "bao1x".to_string(); self.utra_target = "bao1x".to_string();
self.run_svd2repl = false; self.run_svd2repl = false;
self.loader = CrateSpec::Local("baremetal".to_string(), LoaderRegion::Ram); self.loader = CrateSpec::Local(subtype.to_string(), LoaderRegion::Ram);
// this is actually a dummy, there is no kernel in baremetal // this is actually a dummy, there is no kernel in baremetal
self.kernel = CrateSpec::Local("xous-kernel".to_string(), LoaderRegion::Ram); self.kernel = CrateSpec::Local("xous-kernel".to_string(), LoaderRegion::Ram);
self self
@ -863,7 +863,7 @@ impl Builder {
output_file.push("target"); output_file.push("target");
output_file.push(self.target_kernel.as_ref().expect("target")); output_file.push(self.target_kernel.as_ref().expect("target"));
output_file.push(stream); output_file.push(stream);
output_file.push("baremetal.img"); output_file.push(format!("{}.img", self.loader.name().unwrap_or("baremetal".to_string())));
let status = Command::new(cargo()) let status = Command::new(cargo())
.current_dir(project_root()) .current_dir(project_root())

View file

@ -601,14 +601,19 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
Some("baremetal-bao1x") => { Some("baremetal-bao1x") => {
builder.set_baremetal(true); builder.set_baremetal(true);
update_flash_origin("baremetal/src/platform/bao1x/link.x", 0x6000_0100)?; update_flash_origin("baremetal/src/platform/bao1x/link.x", 0x6000_0100)?;
builder.target_baremetal_bao1x(); builder.target_baremetal_bao1x("baremetal");
} }
Some("baremetal-bao1x-evb") => { Some("baremetal-bao1x-evb") => {
builder.set_baremetal(true); builder.set_baremetal(true);
update_flash_origin("baremetal/src/platform/bao1x/link.x", 0x6100_0100)?; update_flash_origin("baremetal/src/platform/bao1x/link.x", 0x6100_0100)?;
builder.add_loader_feature("bao1x-evb"); builder.add_loader_feature("bao1x-evb");
builder.target_baremetal_bao1x(); builder.target_baremetal_bao1x("baremetal");
}
Some("bao1x-boot0") => {
builder.set_baremetal(true);
builder.target_baremetal_bao1x("bao1x-boot0");
} }
Some("baosec") => { Some("baosec") => {