xtask: simplify key file path extraction

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2021-08-02 11:08:52 +08:00
parent d112d49524
commit 45008ebe36

View file

@ -282,16 +282,8 @@ fn build_hw_image(
std::env::set_var("XOUS_SVD_FILE", path.canonicalize().unwrap());
// extract key file names; replace with defaults if not specified
let loaderkey_file = if let Some(lkf) = lkey {
lkf
} else {
String::from("devkey/dev.key")
};
let kernelkey_file = if let Some(kkf) = kkey {
kkf
} else {
String::from("devkey/dev.key")
};
let loaderkey_file = lkey.unwrap_or("devkey/dev.key".into());
let kernelkey_file = kkey.unwrap_or("devkey/dev.key".into());
let kernel = build_kernel(debug)?;
let mut init = vec![];