Fix support for single-bank stm32l4 processors

Recent patches for STM32L4+ assumed all STM32L4 processors have a dual-
bank option. This is not the case for STM32L4{3,4,5,6}xx processors and
therefore, these processors (like STM32L433) failed when attempting to
flash the second half of the flash memory. This patch fixed this issue.
Tested on STM32L433xC, STM32L476xG and STM32L471xG.

Change-Id: I8262ba4f05190802c5868d753f3e7af50e581811
Signed-off-by: Armin van der Togt <armin@otheruse.nl>
Reviewed-on: http://openocd.zylin.com/4913
Tested-by: jenkins
Reviewed-by: Peter Tettelaar <peter@float-iot.nl>
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-by: Mark Schulte <mschulte@lyft.com>

diff --git a/src/flash/nor/stm32l4x.c b/src/flash/nor/stm32l4x.c
index 7c5811ead8ce4b0e04fa22936ec79aa24fa971ca..7d1e4298406d0c0b2af50f6d4739d3b456752a77 100644 (file)
--- a/src/flash/nor/stm32l4x.c
+++ b/src/flash/nor/stm32l4x.c
@@ -678,8 +678,9 @@ static int stm32l4_probe(struct flash_bank *bank)
                        /* Invalid FLASH size for this device. */
                        LOG_WARNING("Invalid flash size for STM32L4+ family device.");
                        return ERROR_FAIL;
-               default:
-                       /* Other L4 family devices have 2K pages. */
+               case 0x461:
+               case 0x415:
+                       /* These are dual-bank devices, we need to check the OPT_DBANK_LE_1M bit here */
                        page_size = 2048;
                        num_pages = flash_size_in_kb / 2;
                        /* check that calculation result makes sense */
@@ -689,6 +690,16 @@ static int stm32l4_probe(struct flash_bank *bank)
                        else
                                stm32l4_info->bank2_start = num_pages / 2;
                        break;
+               case 0x462:
+               case 0x435:
+               default:
+                       /* These are single-bank devices */
+                       page_size = 2048;
+                       num_pages = flash_size_in_kb / 2;
+                       /* check that calculation result makes sense */
+                       assert(num_pages > 0);
+                       stm32l4_info->bank2_start = UINT16_MAX;
+                       break;
        }
 
        /* Release sector table if allocated. */