diff --git a/xtask/src/builder.rs b/xtask/src/builder.rs index 826fe1837..f6d92aa98 100644 --- a/xtask/src/builder.rs +++ b/xtask/src/builder.rs @@ -874,8 +874,19 @@ impl Builder { if self.loader_disable_defaults { loader_extra.push("--no-default-features".to_string()); } + // substitute bao1x-alt-boot1 for bao1x-boot1 + let adjusted_loader = match &self.loader { + CrateSpec::Local(name, region) => { + if name == "bao1x-alt-boot1" { + CrateSpec::Local("bao1x-boot1".to_string(), *region) + } else { + self.loader.clone() + } + } + _ => self.loader.clone(), + }; let loader = self.builder( - &[self.loader.clone()], + &[adjusted_loader], &self.loader_features, &self.target_kernel.as_deref(), BuildStream::Release, // loader doesn't fit if you build with Debug @@ -926,7 +937,7 @@ impl Builder { "boot0" } else if name == "bao1x-boot1" { "boot1" - } else if name == "baremetal" { + } else if name == "baremetal" || name == "bao1x-alt-boot1" { "baremetal" } else { return Err(String::from("Target subtype not supported").into()); diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 0b778f5bf..4ce299347 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -651,6 +651,19 @@ fn main() -> Result<(), Box> { .set_sigblock_size(sigblock_size); } + Some("bao1x-alt-boot1") => { + let sigblock_size = 0x300; + update_flash_origin( + "bao1x-boot/boot1/src/platform/bao1x/link.x", + (bao1x_api::LOADER_START + sigblock_size + STATICS_LEN) as u32, + )?; + builder.add_loader_feature("alt-boot1"); + builder + .set_baremetal(true) + .target_baremetal_bao1x("bao1x-alt-boot1") + .set_sigblock_size(sigblock_size); + } + Some("baosec") => { let board = "board-baosec"; let sigblock_size = 0x300;