[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-382-g5070425d6

[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  5070425d6a5457cb83ebf01b59746a66ccbe4e93 (commit)
      from  cdb6ea4f9ff6f61dc4eeadab4dd3edd5d49ab88e (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 5070425d6a5457cb83ebf01b59746a66ccbe4e93
Author: Tarek BOCHKATI <tar...@gm...>
Date:   Sun Aug 29 20:52:50 2021 +0100

    flash/stm32l4x: introduce is_max_flash_size and use it
    
    Change-Id: Idb421b9cf737d222baf4dd890032f69dec7a366e
    Signed-off-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/6536
    Tested-by: jenkins
    Reviewed-by: Oleksij Rempel <li...@re...>

diff --git a/src/flash/nor/stm32l4x.c b/src/flash/nor/stm32l4x.c
index 8734aeb78..56288ee05 100644
--- a/src/flash/nor/stm32l4x.c
+++ b/src/flash/nor/stm32l4x.c
@@ -1818,6 +1818,8 @@ static int stm32l4_probe(struct flash_bank *bank)
 	/* did we assign a flash size? */
 	assert((flash_size_kb != 0xffff) && flash_size_kb);
 
+	const bool is_max_flash_size = flash_size_kb == stm32l4_info->part_info->max_flash_size_kb;
+
 	stm32l4_info->bank1_sectors = 0;
 	stm32l4_info->hole_sectors = 0;
 
@@ -1825,7 +1827,6 @@ static int stm32l4_probe(struct flash_bank *bank)
 	int page_size_kb = 0;
 
 	stm32l4_info->dual_bank_mode = false;
-	bool use_dbank_bit = false;
 
 	switch (device_id) {
 	case DEVID_STM32L47_L48XX:
@@ -1843,7 +1844,7 @@ static int stm32l4_probe(struct flash_bank *bank)
 		stm32l4_info->bank1_sectors = num_pages;
 
 		/* check DUAL_BANK bit[21] if the flash is less than 1M */
-		if (flash_size_kb == 1024 || (stm32l4_info->optr & BIT(21))) {
+		if (is_max_flash_size || (stm32l4_info->optr & BIT(21))) {
 			stm32l4_info->dual_bank_mode = true;
 			stm32l4_info->bank1_sectors = num_pages / 2;
 		}
@@ -1907,9 +1908,8 @@ static int stm32l4_probe(struct flash_bank *bank)
 		page_size_kb = 8;
 		num_pages = flash_size_kb / page_size_kb;
 		stm32l4_info->bank1_sectors = num_pages;
-		use_dbank_bit = flash_size_kb == part_info->max_flash_size_kb;
-		if ((use_dbank_bit && (stm32l4_info->optr & BIT(22))) ||
-			(!use_dbank_bit && (stm32l4_info->optr & BIT(21)))) {
+		if ((is_max_flash_size && (stm32l4_info->optr & BIT(22))) ||
+			(!is_max_flash_size && (stm32l4_info->optr & BIT(21)))) {
 			stm32l4_info->dual_bank_mode = true;
 			page_size_kb = 4;
 			num_pages = flash_size_kb / page_size_kb;
@@ -1924,9 +1924,8 @@ static int stm32l4_probe(struct flash_bank *bank)
 		page_size_kb = 4;
 		num_pages = flash_size_kb / page_size_kb;
 		stm32l4_info->bank1_sectors = num_pages;
-		use_dbank_bit = flash_size_kb == part_info->max_flash_size_kb;
-		if ((use_dbank_bit && (stm32l4_info->optr & BIT(22))) ||
-			(!use_dbank_bit && (stm32l4_info->optr & BIT(21)))) {
+		if ((is_max_flash_size && (stm32l4_info->optr & BIT(22))) ||
+			(!is_max_flash_size && (stm32l4_info->optr & BIT(21)))) {
 			stm32l4_info->dual_bank_mode = true;
 			page_size_kb = 2;
 			num_pages = flash_size_kb / page_size_kb;
@@ -1940,7 +1939,7 @@ static int stm32l4_probe(struct flash_bank *bank)
 		page_size_kb = 8;
 		num_pages = flash_size_kb / page_size_kb;
 		stm32l4_info->bank1_sectors = num_pages;
-		if ((flash_size_kb == part_info->max_flash_size_kb) || (stm32l4_info->optr & BIT(21))) {
+		if (is_max_flash_size || (stm32l4_info->optr & BIT(21))) {
 			stm32l4_info->dual_bank_mode = true;
 			stm32l4_info->bank1_sectors = num_pages / 2;
 		}

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

Summary of changes:
 src/flash/nor/stm32l4x.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository