X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fstm32l4x.c;h=ae0ae26ac14f74cbaa386fefb8fc8990d78bde91;hp=ad179216d86019a213b6a0a8c804a5ac0d6457c6;hb=20113201df25475889a3cd9ee22c0397e4fae530;hpb=1b864d6e49d634a382ba1ed13f650898872627cf;ds=sidebyside

diff --git a/src/flash/nor/stm32l4x.c b/src/flash/nor/stm32l4x.c
index ad179216d8..ae0ae26ac1 100644
--- a/src/flash/nor/stm32l4x.c
+++ b/src/flash/nor/stm32l4x.c
@@ -93,7 +93,7 @@
 
 /* STM32_FLASH_OBR bit definitions (reading) */
 
-#define OPT_DUALBANK   21	/* dual flash bank only */
+#define OPT_DUALBANK   (1 << 21)	/* dual flash bank only */
 
 /* register unlock keys */
 
@@ -631,12 +631,6 @@ static int stm32l4_probe(struct flash_bank *bank)
 	if (retval != ERROR_OK)
 		return retval;
 
-	/* only devices with < 1024 kiB may be set to single bank dual banks */
-	if ((flash_size_in_kb == 1024) || !(options & OPT_DUALBANK))
-		stm32l4_info->bank2_start = 256;
-	else
-		stm32l4_info->bank2_start = flash_size_in_kb << 9;
-
 	/* did we assign flash size? */
 	assert((flash_size_in_kb != 0xffff) && flash_size_in_kb);
 
@@ -646,6 +640,12 @@ static int stm32l4_probe(struct flash_bank *bank)
 	/* check that calculation result makes sense */
 	assert(num_pages > 0);
 
+	/* only devices with < 1024 kiB may be set to single bank dual banks */
+	if ((flash_size_in_kb == 1024) || !(options & OPT_DUALBANK))
+		stm32l4_info->bank2_start = 256;
+	else
+		stm32l4_info->bank2_start = num_pages / 2;
+
 	if (bank->sectors) {
 		free(bank->sectors);
 		bank->sectors = NULL;