On 8/18/26 17:11, Patrice Chotard wrote:
> Move the definition of TAMP_FWU_BOOT_IDX_MASK and
> TAMP_FWU_BOOT_IDX_OFFSET outside of config check for
> CONFIG_STM32MP15X and CONFIG_STM32MP13X.
>
> This patch solves a STM32MP2 compilation issue in
> board/st/common/stm32mp_fwu.c when CONFIG_FWU_MULTI_BANK_UPDATE
> is activated.
>
> Fixes: 5166658ac605 ("ARM: stm32mp2: Factorize TAMP_FWU_BOOT_IDX_MASK/OFFSET
> definition")
> Signed-off-by: Patrick Delaunay <[email protected]>
> Signed-off-by: Patrice Chotard <[email protected]>
> ---
> arch/arm/mach-stm32mp/include/mach/stm32.h | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-stm32mp/include/mach/stm32.h
> b/arch/arm/mach-stm32mp/include/mach/stm32.h
> index 42e3735847a..dfbd4f43629 100644
> --- a/arch/arm/mach-stm32mp/include/mach/stm32.h
> +++ b/arch/arm/mach-stm32mp/include/mach/stm32.h
> @@ -67,6 +67,9 @@ enum forced_boot_mode {
> BOOT_UMS_MMC2 = 0x12,
> };
>
> +#define TAMP_FWU_BOOT_IDX_MASK GENMASK(3, 0)
> +#define TAMP_FWU_BOOT_IDX_OFFSET 0
> +
> #endif
>
> /*
> @@ -135,9 +138,6 @@ enum forced_boot_mode {
> /* TAMP registers */
> #define TAMP_BACKUP_REGISTER(x) (STM32_TAMP_BASE + 0x100 + 4 *
> x)
>
> -#define TAMP_FWU_BOOT_IDX_MASK GENMASK(3, 0)
> -#define TAMP_FWU_BOOT_IDX_OFFSET 0
> -
> #ifdef CONFIG_STM32MP15X
> #define TAMP_BACKUP_MAGIC_NUMBER TAMP_BACKUP_REGISTER(4)
> #define TAMP_BACKUP_BRANCH_ADDRESS TAMP_BACKUP_REGISTER(5)
>
Does not consider this patch, Patrick has already submitted the same :
https://patchwork.ozlabs.org/project/uboot/patch/20260717143131.1.I2460c17ad1978f8c5c5e85a6ba56cfd46ed975cf@changeid/
Patrice
