flash: fix stm32 failed probe using incorrect flash size

[openocd.git] / src / flash / nor / stm32lx.c

diff --git a/src/flash/nor/stm32lx.c b/src/flash/nor/stm32lx.c
index d90b5f6262d3dafc6ea1bb4c42b90e430397a585..61ae57407c08605fae5ec60f2d1855260f6f8944 100644 (file)
--- a/src/flash/nor/stm32lx.c
+++ b/src/flash/nor/stm32lx.c
@@ -122,6 +122,7 @@ static int stm32lx_wait_until_bsy_clear(struct flash_bank *bank);
 struct stm32lx_flash_bank {
        int probed;
        bool has_dual_banks;
+       uint32_t user_bank_size;
 };
 
 /* flash bank stm32lx <base> <size> 0 0 <target#>
@@ -145,6 +146,7 @@ FLASH_BANK_COMMAND_HANDLER(stm32lx_flash_bank_command)
 
        stm32lx_info->probed = 0;
        stm32lx_info->has_dual_banks = false;
+       stm32lx_info->user_bank_size = bank->size;
 
        return ERROR_OK;
 }
@@ -538,6 +540,10 @@ static int stm32lx_probe(struct flash_bank *bank)
        case 0x416:
                max_flash_size_in_kb = 128;
                break;
+       case 0x427:
+               /* single bank, high density */
+               max_flash_size_in_kb = 256;
+               break;
        case 0x436:
                /* According to ST, the devices with id 0x436 have dual bank flash and comes with
                 * a total flash size of 384k or 256kb. However, the first bank is always 192kb,
@@ -593,8 +599,8 @@ static int stm32lx_probe(struct flash_bank *bank)
 
        /* if the user sets the size manually then ignore the probed value
         * this allows us to work around devices that have a invalid flash size register value */
-       if (bank->size) {
-               flash_size_in_kb = bank->size / 1024;
+       if (stm32lx_info->user_bank_size) {
+               flash_size_in_kb = stm32lx_info->user_bank_size / 1024;
                LOG_INFO("ignoring flash probed value, using configured bank size: %dkbytes", flash_size_in_kb);
        }