mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-20 09:03:28 +00:00
commit latest test config
- swap works on hardware (at least reading in the encrypted images works) - renode version is deliberately configured to trigger an edge case in the swapper, and is broken -- to be debugged
This commit is contained in:
parent
0f79056ac7
commit
b8a088dc78
1 changed files with 9 additions and 7 deletions
|
|
@ -270,7 +270,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
builder.add_loader_feature("renode-bypass");
|
builder.add_loader_feature("renode-bypass");
|
||||||
}
|
}
|
||||||
Some("renode-swap") => {
|
Some("renode-swap") => {
|
||||||
let swap_pkgs = ["xous-ticktimer", "xous-log", "xous-names", "xous-susres"];
|
let swap_pkgs = ["xous-ticktimer", "xous-log", "xous-susres", "xous-names"];
|
||||||
if !builder.is_swap_set() {
|
if !builder.is_swap_set() {
|
||||||
builder.set_swap(0x4080_0000, 8 * 1024 * 1024);
|
builder.set_swap(0x4080_0000, 8 * 1024 * 1024);
|
||||||
}
|
}
|
||||||
|
|
@ -291,7 +291,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
builder.add_service(service, LoaderRegion::Flash);
|
builder.add_service(service, LoaderRegion::Flash);
|
||||||
}
|
}
|
||||||
builder.add_service("test-swapper", LoaderRegion::Swap); // when we implement loaded-but-swapped, use that instead
|
builder.add_service("test-swapper", LoaderRegion::Swap); // when we implement loaded-but-swapped, use that instead
|
||||||
builder.add_apps(&get_cratespecs());
|
builder.add_service("graphics-server", LoaderRegion::Swap);
|
||||||
|
builder.add_service("trng", LoaderRegion::Swap);
|
||||||
|
builder.add_apps(get_cratespecs());
|
||||||
}
|
}
|
||||||
|
|
||||||
// ------- hosted mode configs -------
|
// ------- hosted mode configs -------
|
||||||
|
|
@ -466,19 +468,19 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
// ------ Cramium hardware image configs ------
|
// ------ Cramium hardware image configs ------
|
||||||
Some("cramium-fpga") | Some("cramium-soc") => {
|
Some("cramium-fpga") | Some("cramium-soc") => {
|
||||||
let cramium_flash_pkgs =
|
let cramium_flash_pkgs =
|
||||||
["xous-log", "xous-names", "xous-ticktimer", "cram-hal-service"].to_vec();
|
["xous-ticktimer", "xous-log", "xous-names", "cram-hal-service", "cram-console"].to_vec();
|
||||||
let cramium_swap_pkgs = ["graphics-server", "cram-console", "test-swapper"].to_vec();
|
let cramium_swap_pkgs = ["test-swapper", "graphics-server"].to_vec();
|
||||||
if !builder.is_swap_set() {
|
if !builder.is_swap_set() {
|
||||||
builder.set_swap(0, 4 * 1024 * 1024);
|
builder.set_swap(0, 4 * 1024 * 1024);
|
||||||
}
|
}
|
||||||
builder.add_loader_feature("board-bringup");
|
// builder.add_loader_feature("board-bringup");
|
||||||
builder.add_loader_feature("spim-test");
|
// builder.add_loader_feature("spim-test");
|
||||||
// builder.add_loader_feature("spi-alt-channel"); // this flag, when asserted, uses the J_QSPI
|
// builder.add_loader_feature("spi-alt-channel"); // this flag, when asserted, uses the J_QSPI
|
||||||
// header. By default, we use JPC7_13 (J_QSPI does not work, for some reason; bit 3 is stuck
|
// header. By default, we use JPC7_13 (J_QSPI does not work, for some reason; bit 3 is stuck
|
||||||
// high...)
|
// high...)
|
||||||
builder.add_loader_feature("debug-print");
|
builder.add_loader_feature("debug-print");
|
||||||
builder.add_loader_feature("swap");
|
builder.add_loader_feature("swap");
|
||||||
builder.add_kernel_feature("debug-print");
|
// builder.add_kernel_feature("debug-print");
|
||||||
builder.add_kernel_feature("debug-swap");
|
builder.add_kernel_feature("debug-swap");
|
||||||
builder.add_kernel_feature("swap");
|
builder.add_kernel_feature("swap");
|
||||||
builder.add_feature("swap");
|
builder.add_feature("swap");
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue