diff --git a/tools/Cargo.toml b/tools/Cargo.toml index a4a53ad99..d0b74d214 100644 --- a/tools/Cargo.toml +++ b/tools/Cargo.toml @@ -48,6 +48,9 @@ name = "read-tags" [[bin]] name = "sign-image" +[[bin]] +name = "create-detached-app" + [features] precursor = [] renode = [] diff --git a/tools/src/sign_image.rs b/tools/src/sign_image.rs index 3c01c0839..098ea1ab5 100644 --- a/tools/src/sign_image.rs +++ b/tools/src/sign_image.rs @@ -312,6 +312,7 @@ where Some("baremetal") => bao1x_api::BAREMETAL_START, Some("kernel") => bao1x_api::KERNEL_START, Some("swap") => bao1x_api::SWAP_START_UF2, + Some("app") => bao1x_api::dabao::APP_RRAM_START, _ => return Err(String::from("UF2 Image Requires a function code").into()), }; diff --git a/tools/src/xous_arguments.rs b/tools/src/xous_arguments.rs index be7c4d6bf..0c5a5700c 100644 --- a/tools/src/xous_arguments.rs +++ b/tools/src/xous_arguments.rs @@ -46,6 +46,7 @@ pub struct XousArguments { pub ram_length: XousSize, ram_name: u32, pub arguments: Vec>, + pub detached_offset: Option, } impl fmt::Display for XousArguments { @@ -72,11 +73,14 @@ impl fmt::Display for XousArguments { impl XousArguments { pub fn new(ram_start: XousSize, ram_length: XousSize, ram_name: u32) -> XousArguments { - XousArguments { ram_start, ram_length, ram_name, arguments: vec![] } + XousArguments { ram_start, ram_length, ram_name, arguments: vec![], detached_offset: None } } + pub fn set_detached_offset(&mut self, offset: XousSize) { self.detached_offset = Some(offset); } + pub fn finalize(&mut self) { - let mut running_offset = crate::tags::align_size_up(self.len() as usize, 0); + let mut running_offset = + crate::tags::align_size_up(self.len() as usize, 0) + self.detached_offset.unwrap_or(0) as usize; // println!("offset: {:x}, alignment_offset: {:x}", running_offset, 0); for arg in &mut self.arguments { running_offset = crate::tags::align_size_up(running_offset, arg.alignment_offset());