From a397981355cd852aabbad0db34dbf213bfd3fbd4 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 6 Oct 2020 00:57:26 +0800 Subject: [PATCH] change references to "ci" to "hw-image" --- buildpush.sh | 2 +- xtask/src/main.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildpush.sh b/buildpush.sh index 6b82c1684..93ccac476 100755 --- a/buildpush.sh +++ b/buildpush.sh @@ -16,7 +16,7 @@ fi # This is handled in part by betrusted-scripts, with provision-xous.sh # stage1 and kernel are merged into xous.img by this script. -cargo xtask ci ../betrusted-soc/build/software/soc.svd +cargo xtask hw-image ../betrusted-soc/build/software/soc.svd echo "Copying to target..." if [ $# -gt 0 ] diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 3e96e22f2..109b8de5b 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -42,7 +42,7 @@ fn try_main() -> Result<(), DynError> { Some("renode-image") => image(false)?, Some("renode-image-debug") => image(true)?, Some("run") => run(false)?, - Some("ci") => build_ci(false, env::args().nth(2))?, + Some("hw-image") => build_hw_image(false, env::args().nth(2))?, Some("debug") => run(true)?, _ => print_help(), } @@ -54,14 +54,14 @@ fn print_help() { "Tasks: renode-image builds a test image for renode renode-image-debug builds a test image for renode in debug mode -ci [soc.svd] builds an image for real hardware for CI +hw-image [soc.svd] builds an image for real hardware run runs a release build using a hosted environment debug runs a debug build using a hosted environment " ) } -fn build_ci(debug: bool, svd: Option) -> Result<(), DynError> { +fn build_hw_image(debug: bool, svd: Option) -> Result<(), DynError> { let svd_file = match svd { Some(s) => s, None => return Err("svd file not specified".into()),