stm32lx flash: fix flash size for Medium+ devices

Unfortunately the Medium+ density and 0x436 devices have their F_SIZE register
at a different location: 0x1FF800CC instead of 0x1FF8004C.  Fix this for
the 0x427 Medium+ devices and also the 0x436 devices.  Furthermore, for
0x436 devices the flash size is reported as a 0 or 1 code rather than
the size in Kb.  Please see RM0038 r8 or newer for an explanation, as
noted in the comments.

Change-Id: Ie03b1e119a61f2a854bc2ccc5f90ce3e8852e272
Signed-off-by: Andrey Yurovsky <yurovsky@gmail.com>
Reviewed-on: http://openocd.zylin.com/1522
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>

diff --git a/src/flash/nor/stm32lx.c b/src/flash/nor/stm32lx.c
index 181c3118b47a82790c6ca429325c28661a6aa657..70414cdcde504205973cae9e96fab7e05cd52f72 100644 (file)
--- a/src/flash/nor/stm32lx.c
+++ b/src/flash/nor/stm32lx.c
@@ -88,6 +88,7 @@
 /* other registers */
 #define DBGMCU_IDCODE  0xE0042000
 #define F_SIZE                 0x1FF8004C
 /* other registers */
 #define DBGMCU_IDCODE  0xE0042000
 #define F_SIZE                 0x1FF8004C

+#define F_SIZE_MP              0x1FF800CC /* on 0x427 Medium+ and 0x436 HD devices */

 
 /* Constants */
 #define FLASH_PAGE_SIZE 256
 
 /* Constants */
 #define FLASH_PAGE_SIZE 256


@@ -554,8 +555,23 @@ static int stm32lx_probe(struct flash_bank *bank)
                return ERROR_FAIL;
        }
 
                return ERROR_FAIL;
        }
 

-       /* Get the flash size from target. */
-       retval = target_read_u16(target, F_SIZE, &flash_size_in_kb);
+       /* Get the flash size from target.  0x427 and 0x436 devices use a
+        * different location for the Flash Size register, please see RM0038 r8 or
+        * newer. */
+       if ((device_id & 0xfff) == 0x427 || (device_id & 0xfff) == 0x436)
+                       retval = target_read_u16(target, F_SIZE_MP, &flash_size_in_kb);
+       else
+                       retval = target_read_u16(target, F_SIZE, &flash_size_in_kb);
+
+       /* 0x436 devices report their flash size as a 0 or 1 code indicating 384K
+        * or 256K, respectively.  Please see RM0038 r8 or newer and refer to
+        * section 30.1.1. */
+       if (retval == ERROR_OK && (device_id & 0xfff) == 0x436) {
+               if (flash_size_in_kb == 0)
+                       flash_size_in_kb = 384;
+               else if (flash_size_in_kb == 1)
+                       flash_size_in_kb = 256;
+       }

 
        /* Failed reading flash size or flash size invalid (early silicon),
         * default to max target family */
 
        /* Failed reading flash size or flash size invalid (early silicon),
         * default to max target family */