From 9883833c90d33eb9193bff09d4d877015abc521d Mon Sep 17 00:00:00 2001 From: Yann Gautier Date: Fri, 2 Feb 2024 15:26:50 +0100 Subject: [PATCH] refactor(st): move macros to common folder As these definitions will be the same for STM32MP1 and STM32MP2, move PLATFORM_MTD_MAX_PAGE_SIZE and DWL_BUFFER_SIZE macro definition to the file: plat/st/common/include/stm32mp_common.h Signed-off-by: Yann Gautier Change-Id: I480669d009d15fec753298f47b136e34fa240132 --- plat/st/common/include/stm32mp_common.h | 6 ++++++ plat/st/stm32mp1/include/platform_def.h | 3 --- plat/st/stm32mp1/stm32mp1_def.h | 3 --- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plat/st/common/include/stm32mp_common.h b/plat/st/common/include/stm32mp_common.h index 66b93102d..0ff60929f 100644 --- a/plat/st/common/include/stm32mp_common.h +++ b/plat/st/common/include/stm32mp_common.h @@ -20,6 +20,12 @@ /* FWU configuration (max supported value is 15) */ #define FWU_MAX_TRIAL_REBOOT U(3) +/* Define maximum page size for NAND devices */ +#define PLATFORM_MTD_MAX_PAGE_SIZE U(0x1000) + +/* Needed by STM32CubeProgrammer support */ +#define DWL_BUFFER_SIZE U(0x01000000) + /* Functions to save and get boot context address given by ROM code */ void stm32mp_save_boot_ctx_address(uintptr_t address); uintptr_t stm32mp_get_boot_ctx_address(void); diff --git a/plat/st/stm32mp1/include/platform_def.h b/plat/st/stm32mp1/include/platform_def.h index f26eb526c..7e6d91fe0 100644 --- a/plat/st/stm32mp1/include/platform_def.h +++ b/plat/st/stm32mp1/include/platform_def.h @@ -77,9 +77,6 @@ ******************************************************************************/ #define BL33_BASE STM32MP_BL33_BASE -/* Needed by STM32CubeProgrammer support */ -#define DWL_BUFFER_SIZE U(0x01000000) - /******************************************************************************* * DTB specific defines. ******************************************************************************/ diff --git a/plat/st/stm32mp1/stm32mp1_def.h b/plat/st/stm32mp1/stm32mp1_def.h index 8fc8c8967..0d401f945 100644 --- a/plat/st/stm32mp1/stm32mp1_def.h +++ b/plat/st/stm32mp1/stm32mp1_def.h @@ -186,9 +186,6 @@ enum ddr_type { #endif #define STM32MP_BL33_MAX_SIZE U(0x400000) -/* Define maximum page size for NAND devices */ -#define PLATFORM_MTD_MAX_PAGE_SIZE U(0x1000) - /* Define location for the MTD scratch buffer */ #if STM32MP13 #define STM32MP_MTD_BUFFER (SRAM1_BASE + \