diff options
| author | Tom Rini <trini@konsulko.com> | 2025-03-12 21:36:52 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-03-12 21:36:52 -0600 |
| commit | eeefcacb851f7f0bccabc3089a725f5ce86f5c70 (patch) | |
| tree | 913e063346db8a36c2094aabb35561f9669990fb /arch/arm/mach-stm32mp/stm32mp1/cpu.c | |
| parent | 19a342f9122780a67d96887eae3ab62a189126d5 (diff) | |
| parent | 1a87755ecd0d36ec29acdbcbc9b381e76cfd6cfd (diff) | |
Merge tag 'u-boot-stm32-20250312' of https://source.denx.de/u-boot/custodians/u-boot-stm into next
CI: https://source.denx.de/u-boot/custodians/u-boot-stm/-/pipelines/25112
- Add drivers for MFD STM32 TIMERS and STM32 PWM and enable them on stm32mp135f-dk
- Restrict _debug_uart_init() usage in STM32 serial driver
- Add support for environment in eMMC on STM32MP13xx DHCOR SoM
- Introduce DH STM32MP15xx DHSOM board specific defconfigs
- Fix CONFIG_BOOTCOUNT_ALTBOOTCMD update on DH STM32MP1 DHSOM
- Update maintainer for board stm32f746-disco
- Fix Linux cmdline for stm32f769-disco
- Cleanup in stm32f***-u-boot.dtsi and in board_late_init() by removing
legacy led and button management.
Diffstat (limited to 'arch/arm/mach-stm32mp/stm32mp1/cpu.c')
| -rw-r--r-- | arch/arm/mach-stm32mp/stm32mp1/cpu.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-stm32mp/stm32mp1/cpu.c b/arch/arm/mach-stm32mp/stm32mp1/cpu.c index d5eaf6711b6..18175fd12cc 100644 --- a/arch/arm/mach-stm32mp/stm32mp1/cpu.c +++ b/arch/arm/mach-stm32mp/stm32mp1/cpu.c @@ -138,8 +138,6 @@ int mach_cpu_init(void) if (IS_ENABLED(CONFIG_CMD_STM32PROG_SERIAL) && (boot_mode & TAMP_BOOT_DEVICE_MASK) == BOOT_SERIAL_UART) gd->flags |= GD_FLG_SILENT | GD_FLG_DISABLE_CONSOLE; - else if (IS_ENABLED(CONFIG_DEBUG_UART) && IS_ENABLED(CONFIG_XPL_BUILD)) - debug_uart_init(); return 0; } |