mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
cleanup fonts out of the loader for bao1x target
This commit is contained in:
parent
9434bb5383
commit
a8f90dd71b
3 changed files with 1 additions and 21 deletions
|
|
@ -21,16 +21,3 @@ pub mod regular;
|
||||||
pub mod tall;
|
pub mod tall;
|
||||||
#[cfg(not(feature = "bao1x"))]
|
#[cfg(not(feature = "bao1x"))]
|
||||||
pub mod small;
|
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;
|
|
||||||
|
|
|
||||||
|
|
@ -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")))]
|
#[cfg(all(feature = "secboot", not(feature = "vexii-test")))]
|
||||||
let mut fs_prehash = [0u8; 64];
|
let mut fs_prehash = [0u8; 64];
|
||||||
#[cfg(not(all(feature = "secboot", not(feature = "vexii-test"))))]
|
#[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")))]
|
#[cfg(all(feature = "secboot", not(feature = "vexii-test")))]
|
||||||
if !secboot::validate_xous_img(signed_buffer as *const u32, &mut fs_prehash) {
|
if !secboot::validate_xous_img(signed_buffer as *const u32, &mut fs_prehash) {
|
||||||
loop {}
|
loop {}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,5 @@
|
||||||
MEMORY
|
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
|
FLASH : ORIGIN = 0x60001100, LENGTH = 252k - 256
|
||||||
RAM : ORIGIN = 0x61000000, LENGTH = 2M
|
RAM : ORIGIN = 0x61000000, LENGTH = 2M
|
||||||
}
|
}
|
||||||
|
|
@ -87,11 +85,6 @@ SECTIONS
|
||||||
_edata = .;
|
_edata = .;
|
||||||
} > REGION_DATA AT > REGION_RODATA
|
} > REGION_DATA AT > REGION_RODATA
|
||||||
|
|
||||||
.fonts : ALIGN(65536)
|
|
||||||
{
|
|
||||||
KEEP(*(.fontdata));
|
|
||||||
} > FONTS
|
|
||||||
|
|
||||||
.bss (NOLOAD) :
|
.bss (NOLOAD) :
|
||||||
{
|
{
|
||||||
_sbss = .;
|
_sbss = .;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue