revert custom kernel flag for ditherpunk

we should now be able to create specific threads with
increased stack sizes, instead of a blanket increase on everything
This commit is contained in:
bunnie 2022-06-16 03:27:14 +08:00
parent c6c9a26bf9
commit 1728bafd72

View file

@ -194,7 +194,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
pkgs.push(app);
}
generate_app_menus(&apps);
renode_image(false, &pkgs, &[], None, None, None)?
renode_image(false, &pkgs, &[], None, None)?
}
Some("renode-test") => {
let mut args = env::args();
@ -211,7 +211,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
pkgs.push(app);
}
generate_app_menus(&apps);
renode_image(false, &cbtest_pkgs, &[], None, None, None)?
renode_image(false, &cbtest_pkgs, &[], None, None)?
}
Some("tts") => {
let tmp_dir = tempfile::Builder::new().prefix("bins").tempdir()?;
@ -280,7 +280,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
Some(&["--features", "tts", "--features", "braille"]),
&[&tts_exec_string],
None,
None,
)?;
let mut locale_revert = OpenOptions::new()
.read(true)
@ -308,14 +307,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
extra_packages.as_slice(),
None,
Some(&["--no-default-features", "--features", "renode-bypass", "--features", "debug-print"]),
None,
)?;
} else {
build_hw_image(false, Some("./precursors/soc.svd".to_string()), &pkgs,
None,
None,
None,
extra_packages.as_slice(), None, None)?;
extra_packages.as_slice(), None)?;
}
}
Some("libstd-test") => {
@ -333,7 +331,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
extra_packages.as_slice(),
None,
Some(&["--features", "renode-bypass"]),
None,
)?;
}
Some("ffi-test") => {
@ -356,7 +353,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
None,
&[],
Some(&["--features", "renode-bypass"]),
None,
)?
//renode_image(false, &pkgs, extra_packages.as_slice(),
//None, Some(&["--features", "renode-bypass"]))?;
@ -380,16 +376,15 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
extra_packages.as_slice(),
Some(&["--features", "renode-minimal"]),
Some(&["--features", "renode-bypass"]),
None,
)?;
}
Some("renode-aes-test") => {
generate_app_menus(&Vec::<String>::new());
renode_image(false, &aestest_pkgs, &[], None, None, None)?
renode_image(false, &aestest_pkgs, &[], None, None)?
}
Some("renode-image-debug") => {
generate_app_menus(&vec!["ball".to_string()]);
renode_image(true, &hw_pkgs, &[], None, None, None)?
renode_image(true, &hw_pkgs, &[], None, None)?
}
Some("pddb-ci") => {
generate_app_menus(&Vec::<String>::new());
@ -451,27 +446,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
run(true, &pkgs, None, false)?
}
Some("app-image") => {
let mut args = env::args();
args.nth(1);
let mut pkgs = hw_pkgs.to_vec();
let apps = get_packages();
for app in &apps {
pkgs.push(app);
}
generate_app_menus(&apps);
build_hw_image(
false,
Some("./precursors/soc.svd".to_string()),
&pkgs,
lkey,
kkey,
None,
&[],
None,
None,
)?
}
Some("ditherpunk-image") => {
let mut args = env::args();
args.nth(1);
let mut pkgs = hw_pkgs.to_vec();
@ -491,9 +465,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
]),
&[],
None,
Some(&[
"--features", "ditherpunk",
]),
)?
}
Some("hw-image") => {
@ -518,7 +489,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
None,
&[],
None,
None,
)?
}
Some("gfx-dev") => run(
@ -536,7 +506,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
None,
&[],
None,
None,
)?,
Some("pddb-hosted") => run(false, &pddb_dev_pkgs, None, false)?,
Some("benchmark") => build_hw_image(
@ -548,7 +517,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
None,
&[],
None,
None,
)?,
Some("minimal") => build_hw_image(
false,
@ -559,7 +527,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
None,
&[],
None,
None,
)?,
Some("cbtest") => build_hw_image(
false,
@ -570,7 +537,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
None,
&[],
None,
None,
)?,
Some("trng-test") => {
generate_app_menus(&Vec::<String>::new());
@ -583,7 +549,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
Some(&["--features", "urandomtest"]),
&[],
None,
None,
)?
}
Some("ro-test") => {
@ -597,7 +562,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
Some(&["--features", "ringosctest"]),
&[],
None,
None,
)?
}
Some("av-test") => {
@ -611,7 +575,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
Some(&["--features", "avalanchetest"]),
&[],
None,
None,
)?
}
Some("sr-test") => build_hw_image(
@ -623,7 +586,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
None,
&[],
None,
None,
)?,
Some("burn-kernel") => update_usb(true, false, false, false)?,
Some("burn-loader") => update_usb(false, true, false, false)?,
@ -834,7 +796,6 @@ fn build_hw_image(
extra_args: Option<&[&str]>,
extra_packages: &[&str],
loader_features: Option<&[&str]>,
kernel_features: Option<&[&str]>,
) -> Result<(), DynError> {
let svd_file = match svd {
Some(s) => s,
@ -855,7 +816,7 @@ fn build_hw_image(
let loaderkey_file = lkey.unwrap_or_else(|| "devkey/dev.key".into());
let kernelkey_file = kkey.unwrap_or_else(|| "devkey/dev.key".into());
let kernel = build_kernel(debug, kernel_features)?;
let kernel = build_kernel(debug)?;
let mut init = vec![];
let base_path = build(
packages,
@ -1004,7 +965,6 @@ fn renode_image(
extra_packages: &[&str],
xous_features: Option<&[&str]>,
loader_features: Option<&[&str]>,
kernel_features: Option<&[&str]>,
) -> Result<(), DynError> {
// Regenerate the Platform file
let status = Command::new(cargo())
@ -1032,7 +992,6 @@ fn renode_image(
xous_features,
extra_packages,
loader_features,
kernel_features,
)
}
@ -1097,8 +1056,8 @@ fn run(
Ok(())
}
fn build_kernel(debug: bool, features: Option<&[&str]>) -> Result<PathBuf, DynError> {
let mut path = build(&["kernel"], debug, Some(KERNEL_TARGET), None, None, features)?;
fn build_kernel(debug: bool) -> Result<PathBuf, DynError> {
let mut path = build(&["kernel"], debug, Some(KERNEL_TARGET), None, None, None)?;
path.push("kernel");
Ok(path)
}