From 1e6134dc37215d00a2ac98e64faef4ff1f791e5e Mon Sep 17 00:00:00 2001 From: bunnie Date: Thu, 28 Oct 2021 22:52:39 +0800 Subject: [PATCH] fix loader offsets after Rust 1.56 made things grow a bit. hopefully this is the last of the "the compiler grew it" code extensions? .... --- xous-rs/src/definitions.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xous-rs/src/definitions.rs b/xous-rs/src/definitions.rs index f8a6ddb0c..0d3911a26 100644 --- a/xous-rs/src/definitions.rs +++ b/xous-rs/src/definitions.rs @@ -21,10 +21,10 @@ pub const SOC_STAGING_GW_LOC: u32 = 0x0028_0000; // gateware - staging copy pub const SOC_STAGING_GW_LEN: u32 = 0x0028_0000; pub const LOADER_LOC: u32 = 0x0050_0000; // loader - base -pub const LOADER_CODE_LEN: u32 = 0x0002_0000; // code region only -pub const LOADER_FONT_LOC: u32 = 0x0052_0000; // should be the same as graphics-server/src/fontmap.rs/FONT_BASE -pub const LOADER_FONT_LEN: u32 = 0x0046_0000; // length of font region only -pub const LOADER_TOTAL_LEN: u32 = 0x0048_0000; // code + font +pub const LOADER_CODE_LEN: u32 = 0x0003_0000; // code region only +pub const LOADER_FONT_LOC: u32 = 0x0053_0000; // should be the same as graphics-server/src/fontmap.rs/FONT_BASE +pub const LOADER_FONT_LEN: u32 = 0x0045_0000; // length of font region only +pub const LOADER_TOTAL_LEN: u32 = LOADER_CODE_LEN + LOADER_FONT_LEN; // code + font pub const KERNEL_LOC: u32 = 0x0098_0000; // kernel start pub const KERNEL_LEN: u32 = 0x0038_0000; // max kernel length