[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-349-g1bce8d3d8

[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  1bce8d3d80490d66b56c2283e3ffee81a655a80a (commit)
      from  76ba25a8a570d5e465e9ed3afdd36cf837fcb6a1 (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 1bce8d3d80490d66b56c2283e3ffee81a655a80a
Author: Tarek BOCHKATI <tar...@gm...>
Date:   Thu Jul 29 10:35:26 2021 +0100

    flash/stm32l4x: do not report bank mode before probing [FIX]
    
    in line 1391, get_stm32l4_bank_type_str(bank) will always output the same
    value "Flash single" since the variable stm32l4_info->dual_bank_mode is false
    by default, stm32l4_info->dual_bank_mode will be set correctly afterward
    in the switch case at line 1467
    
    thus the need to remove the usage of get_stm32l4_bank_type_str(bank) before
    stm32l4_info->dual_bank_mode initialization.
    
    Fixes: 64c2e03b23d9 ("flash/nor: improved API of flash_driver.info & fixed buffer overruns")
    Change-Id: Ia8dc7e144e0ded6143682eb514c247f27859ff81
    Signed-off-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/6411
    Reviewed-by: Oleksij Rempel <li...@re...>
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Tested-by: jenkins

diff --git a/src/flash/nor/stm32l4x.c b/src/flash/nor/stm32l4x.c
index d770cdfa5..5287ff6b3 100644
--- a/src/flash/nor/stm32l4x.c
+++ b/src/flash/nor/stm32l4x.c
@@ -1387,9 +1387,8 @@ static int stm32l4_probe(struct flash_bank *bank)
 	const char *rev_str = get_stm32l4_rev_str(bank);
 	const uint16_t rev_id = stm32l4_info->idcode >> 16;
 
-	LOG_INFO("device idcode = 0x%08" PRIx32 " (%s - Rev %s : 0x%04x - %s-bank)",
-			stm32l4_info->idcode, part_info->device_str, rev_str, rev_id,
-			get_stm32l4_bank_type_str(bank));
+	LOG_INFO("device idcode = 0x%08" PRIx32 " (%s - Rev %s : 0x%04x)",
+			stm32l4_info->idcode, part_info->device_str, rev_str, rev_id);
 
 	stm32l4_info->flash_regs = stm32l4_info->part_info->default_flash_regs;
 

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

Summary of changes:
 src/flash/nor/stm32l4x.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository