[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-1060-g0a11537b3

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  0a11537b3220749107f4ec78c76236ac8c9339d1 (commit)
      from  6dfcc3f5a5b7101d9d44312e6a96e0bea05a558d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0a11537b3220749107f4ec78c76236ac8c9339d1
Author: Tarek BOCHKATI <tar...@gm...>
Date:   Wed Feb 5 19:00:46 2020 +0100

    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 <tar...@gm...>
    Reviewed-on: http://openocd.zylin.com/5437
    Reviewed-by: Marc Schink <de...@za...>
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index 1c89d8c0b..cdec3b0f5 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 e6473f8c2..f112f88f1 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 63151b50e..725953486 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 }
 

-----------------------------------------------------------------------

Summary of changes:
 doc/openocd.texi        | 2 +-
 src/flash/nor/stm32lx.c | 2 +-
 src/flash/startup.tcl   | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository