From 07e43d44591037001ec6f24935427ab0116dee82 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sat, 4 Oct 2025 00:55:17 +0800 Subject: [PATCH] minor cleanup in builder code for specifying swap regions --- xtask/src/builder.rs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/xtask/src/builder.rs b/xtask/src/builder.rs index 67dce1a55..a64cc23db 100644 --- a/xtask/src/builder.rs +++ b/xtask/src/builder.rs @@ -114,6 +114,10 @@ impl From<&str> for CrateSpec { } } +pub struct SwapSpec { + pub offchip_ram_offset: u32, + pub offchip_ram_len: u32, +} pub(crate) struct Builder { loader: CrateSpec, loader_features: Vec, @@ -144,8 +148,8 @@ pub(crate) struct Builder { dry_run: bool, /// when set to true, user selected packages are compiled but no image is created no_image: bool, - /// when Some, specifies a swap region as offset, size - swap: Option<(u32, u32)>, + /// when Some, specifies a swap region + swap: Option, change_target: bool, baremetal: bool, sigblock_size: usize, @@ -212,7 +216,7 @@ impl Builder { } pub fn set_swap<'a>(&'a mut self, offset: u32, size: u32) -> &'a mut Builder { - self.swap = Some((offset, size)); + self.swap = Some(SwapSpec { offchip_ram_offset: offset, offchip_ram_len: size }); self } @@ -1176,8 +1180,8 @@ impl Builder { args.push(i); } - let swap_spec = if let Some((offset, size)) = self.swap { - format!("0x{:x}:0x{:x}", offset, size) // create-image requires a base decorator, but the argument into xtask does not. + let swap_spec = if let Some(spec) = &self.swap { + format!("0x{:x}:0x{:x}", spec.offchip_ram_offset, spec.offchip_ram_len) // create-image requires a base decorator, but the argument into xtask does not. } else { String::new() };