Merge branch 'main' into cram-dev

This commit is contained in:
bunnie (Cramium) 2025-01-30 20:21:28 +08:00 committed by GitHub
commit dedf8c21d9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 5 deletions

View file

@ -86,12 +86,12 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
_edata = .; _edata = .;
} > REGION_DATA AT > REGION_RODATA } > REGION_DATA AT > REGION_RODATA
/*
.fonts : ALIGN(65536) .fonts : ALIGN(65536)
{ {
KEEP(*(.fontdata)); KEEP(*(.fontdata));
} > FONTS } > FONTS
*/
.bss (NOLOAD) : .bss (NOLOAD) :
{ {
_sbss = .; _sbss = .;

View file

@ -583,8 +583,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
// - bao-console is the serial debug console handler // - bao-console is the serial debug console handler
// - [planned] pddb server // - [planned] pddb server
// - [planned] vault application // - [planned] vault application
let bao_rram_pkgs = ["xous-ticktimer", "xous-log", "xous-names", "usb-cramium"].to_vec(); 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"].to_vec(); /* "bao-video" */ let bao_swap_pkgs = ["cram-hal-service", "bao-console", "bao-video"].to_vec(); /* "bao-video" */
if !builder.is_swap_set() { if !builder.is_swap_set() {
builder.set_swap(0, 8 * 1024 * 1024); builder.set_swap(0, 8 * 1024 * 1024);
} }
@ -598,8 +598,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
if false { if false {
builder.add_loader_feature("userspace-swap-debug"); builder.add_loader_feature("userspace-swap-debug");
builder.add_feature("debug-print-swapper"); 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"); builder.add_feature("debug-print-usb");
} else {
} }
builder.add_kernel_feature("debug-swap"); builder.add_kernel_feature("debug-swap");
// builder.add_kernel_feature("debug-print"); // builder.add_kernel_feature("debug-print");