From fe86d5b9e360c77f6f617b6faaa648a5239966b3 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Mon, 26 Apr 2021 09:29:54 +0800 Subject: [PATCH] xtask: fix new path to soc svd file The soc.svd file has now moved under `emulation/soc/` instead of just under `emulation/`, due to the fact that we now have an EC to emulate as well. Signed-off-by: Sean Cross --- xtask/src/main.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 66be2ad60..380b8dfd0 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -160,7 +160,7 @@ fn build_hw_image(debug: bool, svd: Option, packages: &[&str], extra_arg // Tools use this environment variable to know when to rebuild the UTRA crate. std::env::set_var("XOUS_SVD_FILE", path.canonicalize().unwrap()); - // std::fs::copy(path, std::path::Path::new("emulation/renode.svd"))?; + // std::fs::copy(path, std::path::Path::new("emulation/soc/renode.svd"))?; let kernel = build_kernel(debug)?; let mut init = vec![]; @@ -217,7 +217,7 @@ fn build_hw_image(debug: bool, svd: Option, packages: &[&str], extra_arg } fn renode_image(debug: bool, packages: &[&str]) -> Result<(), DynError> { - let path = std::path::Path::new("emulation/renode.svd"); + let path = std::path::Path::new("emulation/soc/renode.svd"); std::env::set_var("XOUS_SVD_FILE", path.canonicalize().unwrap()); let kernel = build_kernel(debug)?; let mut init = vec![]; @@ -233,7 +233,7 @@ fn renode_image(debug: bool, packages: &[&str]) -> Result<(), DynError> { &kernel, &init, debug, - MemorySpec::SvdFile("emulation/renode.svd".into()), + MemorySpec::SvdFile("emulation/soc/renode.svd".into()), )?; Ok(())