diff options
| author | Tom Rini <[email protected]> | 2026-09-01 08:14:37 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-09-01 08:14:37 -0600 |
| commit | cc8c034e78eba6b2a3845783889b80753bb1af1e (patch) | |
| tree | 8c6bee600212d19de24923334d2b9a3a1cdafc94 | |
| parent | 3f19667468fb93bcb5702d23aa057b72639e3ac8 (diff) | |
| parent | 62ea65e54ac7a5c5accda8127830bd0efa4109b6 (diff) | |
Merge tag 'u-boot-stm32-20260831' of https://git.u-boot-project.org/u-boot/custodians/u-boot-stm
Fixes:
_ bound the invalid-argument message in stm32mp1_ddr_subcmd()
_ Move TAMP_FWU_BOOT_IDX_MASK/OFFSET definition to fix STM32MP2
compilation issue.
| -rw-r--r-- | arch/arm/mach-stm32mp/include/mach/stm32.h | 6 | ||||
| -rw-r--r-- | drivers/ram/stm32mp1/stm32mp1_interactive.c | 4 |
2 files changed, 5 insertions, 5 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) diff --git a/drivers/ram/stm32mp1/stm32mp1_interactive.c b/drivers/ram/stm32mp1/stm32mp1_interactive.c index 6340afbb870..3154fde6bfb 100644 --- a/drivers/ram/stm32mp1/stm32mp1_interactive.c +++ b/drivers/ram/stm32mp1/stm32mp1_interactive.c @@ -334,8 +334,8 @@ static void stm32mp1_ddr_subcmd(struct ddr_info *priv, if ((strict_strtoul(argv[1], 0, &value) < 0) || value >= array_nb) { - sprintf(string, "invalid argument %s", - argv[1]); + snprintf(string, sizeof(string), "invalid argument %s", + argv[1]); result = TEST_FAILED; goto end; } |