diff --git a/loader/src/platform/cramium/link-soc.x b/loader/src/platform/cramium/link-soc.x index 5070b656e..3a56049f9 100644 --- a/loader/src/platform/cramium/link-soc.x +++ b/loader/src/platform/cramium/link-soc.x @@ -86,12 +86,12 @@ SECTIONS . = ALIGN(4); _edata = .; } > REGION_DATA AT > REGION_RODATA -/* + .fonts : ALIGN(65536) { KEEP(*(.fontdata)); } > FONTS -*/ + .bss (NOLOAD) : { _sbss = .; diff --git a/xtask/src/main.rs b/xtask/src/main.rs index dd87805e2..29af08729 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -583,8 +583,8 @@ fn main() -> Result<(), Box> { // - bao-console is the serial debug console handler // - [planned] pddb server // - [planned] vault application - let bao_rram_pkgs = ["xous-ticktimer", "xous-log", "xous-names", "usb-cramium"].to_vec(); - let bao_swap_pkgs = ["cram-hal-service", "bao-console"].to_vec(); /* "bao-video" */ + let bao_rram_pkgs = ["xous-ticktimer", "xous-log", "xous-names" /* "usb-cramium" */].to_vec(); /* "usb-cramium" */ + let bao_swap_pkgs = ["cram-hal-service", "bao-console", "bao-video"].to_vec(); /* "bao-video" */ if !builder.is_swap_set() { builder.set_swap(0, 8 * 1024 * 1024); } @@ -598,8 +598,9 @@ fn main() -> Result<(), Box> { if false { builder.add_loader_feature("userspace-swap-debug"); builder.add_feature("debug-print-swapper"); - } else { + // use this to enable debug in USB, when the package is selected builder.add_feature("debug-print-usb"); + } else { } builder.add_kernel_feature("debug-swap"); // builder.add_kernel_feature("debug-print");