diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-13 15:00:53 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-13 15:00:53 -0500 |
| commit | ab1a425524a79eeca61e7b67fdf382c7a499346f (patch) | |
| tree | 08f3925c3cb439f674ebf41cc5003c95ea5c4a57 /arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h | |
| parent | 795f8fd0b591eef7cf3f8c6fcf9788280029cc4a (diff) | |
| parent | 7ccaa31380a4abb2b23718008a54fe2917db8edf (diff) | |
Merge tag 'u-boot-stm32-20210113' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm
- Enable logging features for stm32mp15 boards
- Update MAINTAINERS emails for STI and STM32
- Activate OF_LIVE for ST stm32mp15 boards
- Switch to MCO2 for PHY 50 MHz clock for DHCOM boards
- Correction in stm32prog command on uart: always flush DFU on start command
- Update USB-C power detection algorithm on DK boards
Diffstat (limited to 'arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h')
| -rw-r--r-- | arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h index bae4e91c01..be482c3402 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h @@ -172,7 +172,7 @@ char *stm32prog_get_error(struct stm32prog_data *data); if (data->phase != PHASE_RESET) { \ sprintf(data->error, args); \ data->phase = PHASE_RESET; \ - pr_err("Error: %s\n", data->error); } \ + log_err("Error: %s\n", data->error); } \ } /* Main function */ |