From a8f90dd71b7b665463329405a31007484fe2401f Mon Sep 17 00:00:00 2001 From: bunnie Date: Thu, 25 Sep 2025 16:12:26 +0800 Subject: [PATCH] cleanup fonts out of the loader for bao1x target --- loader/src/fonts.rs | 13 ------------- loader/src/main.rs | 2 +- loader/src/platform/bao1x/link.x | 7 ------- 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/loader/src/fonts.rs b/loader/src/fonts.rs index 0f320b652..e808820c9 100644 --- a/loader/src/fonts.rs +++ b/loader/src/fonts.rs @@ -21,16 +21,3 @@ pub mod regular; pub mod tall; #[cfg(not(feature = "bao1x"))] pub mod small; - -#[cfg(feature = "bao1x")] -pub mod emoji; -#[cfg(feature = "bao1x")] -pub mod bold; -#[cfg(feature = "bao1x")] -pub mod mono; -#[cfg(feature = "bao1x")] -pub mod regular; -#[cfg(feature = "bao1x")] -pub mod tall; -#[cfg(feature = "bao1x")] -pub mod small; diff --git a/loader/src/main.rs b/loader/src/main.rs index b60e06d3d..4f62749ef 100644 --- a/loader/src/main.rs +++ b/loader/src/main.rs @@ -157,7 +157,7 @@ pub unsafe extern "C" fn rust_entry(signed_buffer: *const usize, signature: u32) #[cfg(all(feature = "secboot", not(feature = "vexii-test")))] let mut fs_prehash = [0u8; 64]; #[cfg(not(all(feature = "secboot", not(feature = "vexii-test"))))] - let mut fs_prehash = [0u8; 64]; + let fs_prehash = [0u8; 64]; #[cfg(all(feature = "secboot", not(feature = "vexii-test")))] if !secboot::validate_xous_img(signed_buffer as *const u32, &mut fs_prehash) { loop {} diff --git a/loader/src/platform/bao1x/link.x b/loader/src/platform/bao1x/link.x index 4ef2510b7..db09be8d5 100644 --- a/loader/src/platform/bao1x/link.x +++ b/loader/src/platform/bao1x/link.x @@ -1,7 +1,5 @@ MEMORY { - /* if the font location is adjusted, this needs to be updated in libs/blitstr2 codegen templates.go FONT_BASE value */ - FONTS : ORIGIN = 0x60040000, LENGTH = 128k FLASH : ORIGIN = 0x60001100, LENGTH = 252k - 256 RAM : ORIGIN = 0x61000000, LENGTH = 2M } @@ -87,11 +85,6 @@ SECTIONS _edata = .; } > REGION_DATA AT > REGION_RODATA - .fonts : ALIGN(65536) - { - KEEP(*(.fontdata)); - } > FONTS - .bss (NOLOAD) : { _sbss = .;