From 0a11537b3220749107f4ec78c76236ac8c9339d1 Mon Sep 17 00:00:00 2001 From: Tarek BOCHKATI Date: Wed, 5 Feb 2020 19:00:46 +0100 Subject: [PATCH] flash/stm32lx: mention explicitly that this driver covers STM32 L0 and L1 this is to avoid confusion with STM32 L4, L4+ and L5 families also: - a warning message is changed to error - stm32l0x and stm32l1x aliases has been created to permit the usage of either names Change-Id: If3f16d2a3b7d1369959aa7407da37a9076ea91d7 Signed-off-by: Tarek BOCHKATI Reviewed-on: http://openocd.zylin.com/5437 Reviewed-by: Marc Schink Tested-by: jenkins Reviewed-by: Tomas Vanek --- doc/openocd.texi | 2 +- src/flash/nor/stm32lx.c | 2 +- src/flash/startup.tcl | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/openocd.texi b/doc/openocd.texi index 1c89d8c0b1..cdec3b0f51 100644 --- a/doc/openocd.texi +++ b/doc/openocd.texi @@ -6852,7 +6852,7 @@ stm32h7x option_write 0 0x20 0x8000000 0x8000000 @end deffn @deffn {Flash Driver} stm32lx -All members of the STM32L microcontroller families from STMicroelectronics +All members of the STM32L0 and STM32L1 microcontroller families from STMicroelectronics include internal flash and use ARM Cortex-M3 and Cortex-M0+ cores. The driver automatically recognizes a number of these chips using the chip identification register, and autoconfigures itself. diff --git a/src/flash/nor/stm32lx.c b/src/flash/nor/stm32lx.c index e6473f8c26..f112f88f11 100644 --- a/src/flash/nor/stm32lx.c +++ b/src/flash/nor/stm32lx.c @@ -756,7 +756,7 @@ static int stm32lx_probe(struct flash_bank *bank) } if (n == ARRAY_SIZE(stm32lx_parts)) { - LOG_WARNING("Cannot identify target as a STM32L family."); + LOG_ERROR("Cannot identify target as an STM32 L0 or L1 family device."); return ERROR_FAIL; } else { LOG_INFO("Device: %s", stm32lx_info->part_info.device_str); diff --git a/src/flash/startup.tcl b/src/flash/startup.tcl index 63151b50e6..725953486a 100644 --- a/src/flash/startup.tcl +++ b/src/flash/startup.tcl @@ -109,6 +109,10 @@ proc stm32f3x args { eval stm32f1x $args } proc stm32f4x args { eval stm32f2x $args } proc stm32f7x args { eval stm32f2x $args } +# stm32lx driver supports both STM32 L0 and L1 devices +proc stm32l0x args { eval stm32lx $args } +proc stm32l1x args { eval stm32lx $args } + # stm32wb uses the same flash driver as the stm32l4x proc stm32wbx args { eval stm32l4x $args } -- 2.30.2