diff options
| author | Tom Rini <trini@konsulko.com> | 2025-01-31 08:32:11 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-01-31 08:32:11 -0600 |
| commit | a582e485338633fb2bd3b124a06da1254b71947c (patch) | |
| tree | 8e762f999cd7d4eecf2c3192ef0670c1bfd2fd8e /drivers | |
| parent | 487b254702858a69f96d0c314ab1eab66ac084e2 (diff) | |
| parent | 84bbb8f59a89b24daebc9eff532df6160f049faf (diff) | |
Merge tag 'u-boot-stm32-20250131' of https://source.denx.de/u-boot/custodians/u-boot-stm
STM32 MPU:
- Remove dt-bindings headers available in dts/upstream
- Fixes for stm32prog
- Enable CONFIG_SYS_64BIT_LBA for STM32MP15/13/25 defconfigs
- Add upport of ck_usbo_48m in pre-reloc stage for STM32MP13
- Clean env_get_location() for STM32MP1
- Fix board_get_usable_ram_top() to fix infinite loop in cache
management for STM32MP2.
- Fix ck_flexgen_08 frequency for STM32MP2
STM32 MCU:
- Tune CYCLIC_MAX_CPU_TIME_US to avoid cyclic warning for STM32F469-Disco
- Tune CYCLIC_MAX_CPU_TIME_US to avoid cyclic warning for STM32F769-Disco
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clk/stm32/clk-stm32h7.c | 3 | ||||
| -rw-r--r-- | drivers/fastboot/fb_mmc.c | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/clk/stm32/clk-stm32h7.c b/drivers/clk/stm32/clk-stm32h7.c index a554eda504d..6acf2ff0a8f 100644 --- a/drivers/clk/stm32/clk-stm32h7.c +++ b/drivers/clk/stm32/clk-stm32h7.c @@ -18,6 +18,9 @@ #include <dt-bindings/clock/stm32h7-clks.h> +/* must be equal to last peripheral clock index */ +#define LAST_PERIF_BANK SYSCFG_CK + /* RCC CR specific definitions */ #define RCC_CR_HSION BIT(0) #define RCC_CR_HSIRDY BIT(2) diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c index f11eb66761b..dca7c222f35 100644 --- a/drivers/fastboot/fb_mmc.c +++ b/drivers/fastboot/fb_mmc.c @@ -211,8 +211,8 @@ static int fb_mmc_erase_mmc_hwpart(struct blk_desc *dev_desc) return 1; } - printf("........ erased %lu bytes from mmc hwpart[%u]\n", - dev_desc->lba * dev_desc->blksz, dev_desc->hwpart); + printf("........ erased %llu bytes from mmc hwpart[%u]\n", + (u64)(dev_desc->lba * dev_desc->blksz), dev_desc->hwpart); return 0; } @@ -257,8 +257,8 @@ static void fb_mmc_boot_ops(struct blk_desc *dev_desc, void *buffer, return; } - printf("........ wrote %lu bytes to EMMC_BOOT%d\n", - blkcnt * blksz, hwpart); + printf("........ wrote %llu bytes to EMMC_BOOT%d\n", + (u64)(blkcnt * blksz), hwpart); } else { /* erase */ if (fb_mmc_erase_mmc_hwpart(dev_desc)) { pr_err("Failed to erase EMMC_BOOT%d\n", hwpart); |