From 9df360785e5928b0bf07462b0b6ee04145af6c07 Mon Sep 17 00:00:00 2001 From: cepetr Date: Wed, 7 May 2025 16:17:07 +0200 Subject: [PATCH] fix(core): fix incorrect constants use [no changelog] --- core/embed/io/display/ltdc_dsi/display_fb.c | 4 ++-- core/embed/sys/linker/stm32u5g/firmware.ld | 2 +- core/embed/sys/mpu/stm32u5/mpu.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/embed/io/display/ltdc_dsi/display_fb.c b/core/embed/io/display/ltdc_dsi/display_fb.c index 4e4fac8061..53221bab09 100644 --- a/core/embed/io/display/ltdc_dsi/display_fb.c +++ b/core/embed/io/display/ltdc_dsi/display_fb.c @@ -77,10 +77,10 @@ void display_set_unpriv_access(bool unpriv) { static uint8_t *get_fb_ptr(int16_t index) { #ifdef DISPLAY_GFXMMU if (index == 0) { - return (uint8_t *)GFXMMU_VIRTUAL_BUFFER0_BASE_S; + return (uint8_t *)GFXMMU_VIRTUAL_BUFFER0_BASE; #if (FRAME_BUFFER_COUNT > 1) } else if (index == 1) { - return (uint8_t *)GFXMMU_VIRTUAL_BUFFER1_BASE_S; + return (uint8_t *)GFXMMU_VIRTUAL_BUFFER1_BASE; #endif #else if (index == 0) { diff --git a/core/embed/sys/linker/stm32u5g/firmware.ld b/core/embed/sys/linker/stm32u5g/firmware.ld index de559d22e0..6588b9efe5 100644 --- a/core/embed/sys/linker/stm32u5g/firmware.ld +++ b/core/embed/sys/linker/stm32u5g/firmware.ld @@ -3,7 +3,7 @@ INCLUDE "./embed/sys/linker/stm32u5g/memory.ld"; ENTRY(reset_handler) MEMORY { - FLASH (rx) : ORIGIN = KERNEL_START, LENGTH = FIRMWARE_MAXSIZE + FLASH (rx) : ORIGIN = FIRMWARE_START, LENGTH = FIRMWARE_MAXSIZE AUX1_RAM (wal) : ORIGIN = AUX1_RAM_START, LENGTH = AUX1_RAM_SIZE } diff --git a/core/embed/sys/mpu/stm32u5/mpu.c b/core/embed/sys/mpu/stm32u5/mpu.c index d58f4be647..eda3ed66ed 100644 --- a/core/embed/sys/mpu/stm32u5/mpu.c +++ b/core/embed/sys/mpu/stm32u5/mpu.c @@ -157,7 +157,7 @@ extern uint32_t _codelen; #define COREAPP_FLASH_START \ (COREAPP_CODE_ALIGN(KERNEL_FLASH_START + KERNEL_SIZE) - KERNEL_FLASH_U_SIZE) #define COREAPP_FLASH_SIZE \ - (FIRMWARE_MAXSIZE - (COREAPP_FLASH_START - KERNEL_FLASH_START)) + (FIRMWARE_MAXSIZE - (COREAPP_FLASH_START - FIRMWARE_START)) #endif