From 4feb97aeb47e91a316beac953f593af384387476 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Thu, 19 Dec 2024 21:37:25 +0100 Subject: [PATCH] runtime: Increase code size by 1Kb and stack by 2Kb The rust 1.83 generates code that is a bit larger and uses more stack. Signed-off-by: Arthur Heymans --- common/src/lib.rs | 2 +- drivers/src/memory_layout.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/lib.rs b/common/src/lib.rs index 71c515490f..1d752f8f89 100644 --- a/common/src/lib.rs +++ b/common/src/lib.rs @@ -40,7 +40,7 @@ pub use pcr::{PcrLogEntry, PcrLogEntryId, RT_FW_CURRENT_PCR, RT_FW_JOURNEY_PCR}; pub const FMC_ORG: u32 = 0x40000000; pub const FMC_SIZE: u32 = 20 * 1024; pub const RUNTIME_ORG: u32 = FMC_ORG + FMC_SIZE; -pub const RUNTIME_SIZE: u32 = 98 * 1024; +pub const RUNTIME_SIZE: u32 = 91 * 1024; pub use memory_layout::{DATA_ORG, FHT_ORG, FHT_SIZE, MAN1_ORG}; pub use wdt::{restart_wdt, start_wdt, stop_wdt, WdtTimeout}; diff --git a/drivers/src/memory_layout.rs b/drivers/src/memory_layout.rs index 2f22240b3c..28c3107a0a 100644 --- a/drivers/src/memory_layout.rs +++ b/drivers/src/memory_layout.rs @@ -81,8 +81,8 @@ pub const DPE_SIZE: u32 = 5 * 1024; pub const PCR_RESET_COUNTER_SIZE: u32 = 1024; pub const AUTH_MAN_IMAGE_METADATA_MAX_SIZE: u32 = 7 * 1024; pub const IDEVID_CSR_SIZE: u32 = 1024; -pub const DATA_SIZE: u32 = 113 * 1024; -pub const STACK_SIZE: u32 = 66 * 1024; +pub const DATA_SIZE: u32 = 111 * 1024; +pub const STACK_SIZE: u32 = 68 * 1024; pub const ROM_STACK_SIZE: u32 = 46 * 1024; pub const ESTACK_SIZE: u32 = 1024; pub const ROM_ESTACK_SIZE: u32 = 1024;