diff --git a/xtask/src/builder.rs b/xtask/src/builder.rs index 418b65969..622b2b701 100644 --- a/xtask/src/builder.rs +++ b/xtask/src/builder.rs @@ -825,6 +825,7 @@ impl Builder { if self.change_target { std::fs::remove_file(&svd_spec_path).ok(); // don't fail if the file does not exist } + let is_bao = if self.utra_target == "bao1x" { "--bao1x" } else { "" }; // ------ build the loader ------ // stash any LTO settings applied to the kernel; proper layout of the loader @@ -875,6 +876,7 @@ impl Builder { "--", &loader[0], output_file.as_os_str().to_str().unwrap(), + is_bao, ]) .status()?; if !status.success() { @@ -947,6 +949,7 @@ impl Builder { "--", &loader[0], loader_presign.as_os_str().to_str().unwrap(), + is_bao, ]) .status()?; if !status.success() { diff --git a/xtask/src/main.rs b/xtask/src/main.rs index a7708dc25..6d534572c 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -600,13 +600,13 @@ fn main() -> Result<(), Box> { Some("baremetal-bao1x") => { builder.set_baremetal(true); - update_flash_origin("baremetal/src/platform/bao1x/link.x", 0x6000_0000)?; + update_flash_origin("baremetal/src/platform/bao1x/link.x", 0x6000_0100)?; builder.target_baremetal_bao1x(); } Some("baremetal-bao1x-evb") => { builder.set_baremetal(true); - update_flash_origin("baremetal/src/platform/bao1x/link.x", 0x6100_0000)?; + update_flash_origin("baremetal/src/platform/bao1x/link.x", 0x6100_0100)?; builder.add_loader_feature("bao1x-evb"); builder.target_baremetal_bao1x(); }