flash/nor/stm32f1x: Add support for GD32E23x
[fw/openocd] / src / flash / nor / stm32f1x.c
index af7d9ea3970034cf04d446d12625cbb5bfb0231e..6744779e97c0f5b67f243a011287af243f661287 100644 (file)
@@ -19,9 +19,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -31,7 +29,7 @@
 #include "imp.h"
 #include <helper/binarybuffer.h>
 #include <target/algorithm.h>
-#include <target/armv7m.h>
+#include <target/cortex_m.h>
 
 /* stm32x register locations */
 
 
 /* FLASH_CR register bits */
 
-#define FLASH_PG               (1 << 0)
-#define FLASH_PER              (1 << 1)
-#define FLASH_MER              (1 << 2)
-#define FLASH_OPTPG            (1 << 4)
-#define FLASH_OPTER            (1 << 5)
-#define FLASH_STRT             (1 << 6)
-#define FLASH_LOCK             (1 << 7)
-#define FLASH_OPTWRE   (1 << 9)
+#define FLASH_PG                       (1 << 0)
+#define FLASH_PER                      (1 << 1)
+#define FLASH_MER                      (1 << 2)
+#define FLASH_OPTPG                    (1 << 4)
+#define FLASH_OPTER                    (1 << 5)
+#define FLASH_STRT                     (1 << 6)
+#define FLASH_LOCK                     (1 << 7)
+#define FLASH_OPTWRE           (1 << 9)
+#define FLASH_OBL_LAUNCH       (1 << 13)       /* except stm32f1x series */
 
 /* FLASH_SR register bits */
 
 #define FLASH_ERASE_TIMEOUT 100
 
 struct stm32x_options {
-       uint16_t RDP;
-       uint16_t user_options;
-       uint16_t user_data;
-       uint16_t protection[4];
+       uint8_t rdp;
+       uint8_t user;
+       uint16_t data;
+       uint32_t protection;
 };
 
 struct stm32x_flash_bank {
        struct stm32x_options option_bytes;
        int ppage_size;
-       int probed;
+       bool probed;
 
        bool has_dual_banks;
        /* used to access dual flash bank stm32xl */
+       bool can_load_options;
        uint32_t register_base;
-       uint16_t default_rdp;
+       uint8_t default_rdp;
        int user_data_offset;
        int option_offset;
        uint32_t user_bank_size;
@@ -130,8 +130,8 @@ struct stm32x_flash_bank {
 
 static int stm32x_mass_erase(struct flash_bank *bank);
 static int stm32x_get_device_id(struct flash_bank *bank, uint32_t *device_id);
-static int stm32x_write_block(struct flash_bank *bank, uint8_t *buffer,
-               uint32_t offset, uint32_t count);
+static int stm32x_write_block(struct flash_bank *bank, const uint8_t *buffer,
+               uint32_t address, uint32_t count);
 
 /* flash bank stm32x <base> <size> 0 0 <target#>
  */
@@ -145,14 +145,12 @@ FLASH_BANK_COMMAND_HANDLER(stm32x_flash_bank_command)
        stm32x_info = malloc(sizeof(struct stm32x_flash_bank));
 
        bank->driver_priv = stm32x_info;
-       stm32x_info->probed = 0;
+       stm32x_info->probed = false;
        stm32x_info->has_dual_banks = false;
+       stm32x_info->can_load_options = false;
        stm32x_info->register_base = FLASH_REG_BASE_B0;
        stm32x_info->user_bank_size = bank->size;
 
-       /* the stm32l erased value is 0x00 */
-       bank->default_padded_value = 0x00;
-
        return ERROR_OK;
 }
 
@@ -217,7 +215,7 @@ static int stm32x_check_operation_supported(struct flash_bank *bank)
        /* if we have a dual flash bank device then
         * we need to perform option byte stuff on bank0 only */
        if (stm32x_info->register_base != FLASH_REG_BASE_B0) {
-               LOG_ERROR("Option Byte Operation's must use bank0");
+               LOG_ERROR("Option byte operations must use bank 0");
                return ERROR_FLASH_OPERATION_FAILED;
        }
 
@@ -226,44 +224,33 @@ static int stm32x_check_operation_supported(struct flash_bank *bank)
 
 static int stm32x_read_options(struct flash_bank *bank)
 {
-       uint32_t optiondata;
-       struct stm32x_flash_bank *stm32x_info = NULL;
+       struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
        struct target *target = bank->target;
+       uint32_t option_bytes;
+       int retval;
 
-       stm32x_info = bank->driver_priv;
-
-       /* read current option bytes */
-       int retval = target_read_u32(target, STM32_FLASH_OBR_B0, &optiondata);
+       /* read user and read protection option bytes, user data option bytes */
+       retval = target_read_u32(target, STM32_FLASH_OBR_B0, &option_bytes);
        if (retval != ERROR_OK)
                return retval;
 
-       stm32x_info->option_bytes.user_options = (optiondata >> stm32x_info->option_offset >> 2) & 0xffff;
-       stm32x_info->option_bytes.user_data = (optiondata >> stm32x_info->user_data_offset) & 0xffff;
-       stm32x_info->option_bytes.RDP = (optiondata & (1 << OPT_READOUT)) ? 0xFFFF : 0x5AA5;
-
-       if (optiondata & (1 << OPT_READOUT))
-               LOG_INFO("Device Security Bit Set");
+       stm32x_info->option_bytes.rdp = (option_bytes & (1 << OPT_READOUT)) ? 0 : stm32x_info->default_rdp;
+       stm32x_info->option_bytes.user = (option_bytes >> stm32x_info->option_offset >> 2) & 0xff;
+       stm32x_info->option_bytes.data = (option_bytes >> stm32x_info->user_data_offset) & 0xffff;
 
-       /* each bit refers to a 4bank protection */
-       retval = target_read_u32(target, STM32_FLASH_WRPR_B0, &optiondata);
+       /* read write protection option bytes */
+       retval = target_read_u32(target, STM32_FLASH_WRPR_B0, &stm32x_info->option_bytes.protection);
        if (retval != ERROR_OK)
                return retval;
 
-       stm32x_info->option_bytes.protection[0] = (uint16_t)optiondata;
-       stm32x_info->option_bytes.protection[1] = (uint16_t)(optiondata >> 8);
-       stm32x_info->option_bytes.protection[2] = (uint16_t)(optiondata >> 16);
-       stm32x_info->option_bytes.protection[3] = (uint16_t)(optiondata >> 24);
-
        return ERROR_OK;
 }
 
 static int stm32x_erase_options(struct flash_bank *bank)
 {
-       struct stm32x_flash_bank *stm32x_info = NULL;
+       struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
        struct target *target = bank->target;
 
-       stm32x_info = bank->driver_priv;
-
        /* read current options */
        stm32x_read_options(bank);
 
@@ -296,9 +283,9 @@ static int stm32x_erase_options(struct flash_bank *bank)
        if (retval != ERROR_OK)
                return retval;
 
-       /* clear readout protection and complementary option bytes
+       /* clear read protection option byte
         * this will also force a device unlock if set */
-       stm32x_info->option_bytes.RDP = stm32x_info->default_rdp;
+       stm32x_info->option_bytes.rdp = stm32x_info->default_rdp;
 
        return ERROR_OK;
 }
@@ -333,17 +320,16 @@ static int stm32x_write_options(struct flash_bank *bank)
 
        uint8_t opt_bytes[16];
 
-       target_buffer_set_u16(target, opt_bytes, stm32x_info->option_bytes.RDP);
-       target_buffer_set_u16(target, opt_bytes + 2, stm32x_info->option_bytes.user_options);
-       target_buffer_set_u16(target, opt_bytes + 4, stm32x_info->option_bytes.user_data & 0xff);
-       target_buffer_set_u16(target, opt_bytes + 6, (stm32x_info->option_bytes.user_data >> 8) & 0xff);
-       target_buffer_set_u16(target, opt_bytes + 8, stm32x_info->option_bytes.protection[0]);
-       target_buffer_set_u16(target, opt_bytes + 10, stm32x_info->option_bytes.protection[1]);
-       target_buffer_set_u16(target, opt_bytes + 12, stm32x_info->option_bytes.protection[2]);
-       target_buffer_set_u16(target, opt_bytes + 14, stm32x_info->option_bytes.protection[3]);
-
-       uint32_t offset = STM32_OB_RDP - bank->base;
-       retval = stm32x_write_block(bank, opt_bytes, offset, sizeof(opt_bytes) / 2);
+       target_buffer_set_u16(target, opt_bytes, stm32x_info->option_bytes.rdp);
+       target_buffer_set_u16(target, opt_bytes + 2, stm32x_info->option_bytes.user);
+       target_buffer_set_u16(target, opt_bytes + 4, stm32x_info->option_bytes.data & 0xff);
+       target_buffer_set_u16(target, opt_bytes + 6, (stm32x_info->option_bytes.data >> 8) & 0xff);
+       target_buffer_set_u16(target, opt_bytes + 8, stm32x_info->option_bytes.protection & 0xff);
+       target_buffer_set_u16(target, opt_bytes + 10, (stm32x_info->option_bytes.protection >> 8) & 0xff);
+       target_buffer_set_u16(target, opt_bytes + 12, (stm32x_info->option_bytes.protection >> 16) & 0xff);
+       target_buffer_set_u16(target, opt_bytes + 14, (stm32x_info->option_bytes.protection >> 24) & 0xff);
+
+       retval = stm32x_write_block(bank, opt_bytes, STM32_OB_RDP, sizeof(opt_bytes) / 2);
        if (retval != ERROR_OK) {
                if (retval == ERROR_TARGET_RESOURCE_NOT_AVAILABLE)
                        LOG_ERROR("working area required to erase options bytes");
@@ -360,72 +346,29 @@ static int stm32x_write_options(struct flash_bank *bank)
 static int stm32x_protect_check(struct flash_bank *bank)
 {
        struct target *target = bank->target;
-       struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
-
        uint32_t protection;
-       int i, s;
-       int num_bits;
-       int set;
 
        int retval = stm32x_check_operation_supported(bank);
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
 
-       /* medium density - each bit refers to a 4bank protection
-        * high density - each bit refers to a 2bank protection */
+       /* medium density - each bit refers to a 4 sector protection block
+        * high density - each bit refers to a 2 sector protection block
+        * bit 31 refers to all remaining sectors in a bank */
        retval = target_read_u32(target, STM32_FLASH_WRPR_B0, &protection);
        if (retval != ERROR_OK)
                return retval;
 
-       /* medium density - each protection bit is for 4 * 1K pages
-        * high density - each protection bit is for 2 * 2K pages */
-       num_bits = (bank->num_sectors / stm32x_info->ppage_size);
-
-       if (stm32x_info->ppage_size == 2) {
-               /* high density flash/connectivity line protection */
-
-               set = 1;
-
-               if (protection & (1 << 31))
-                       set = 0;
-
-               /* bit 31 controls sector 62 - 255 protection for high density
-                * bit 31 controls sector 62 - 127 protection for connectivity line */
-               for (s = 62; s < bank->num_sectors; s++)
-                       bank->sectors[s].is_protected = set;
-
-               if (bank->num_sectors > 61)
-                       num_bits = 31;
-
-               for (i = 0; i < num_bits; i++) {
-                       set = 1;
-
-                       if (protection & (1 << i))
-                               set = 0;
-
-                       for (s = 0; s < stm32x_info->ppage_size; s++)
-                               bank->sectors[(i * stm32x_info->ppage_size) + s].is_protected = set;
-               }
-       } else {
-               /* low/medium density flash protection */
-               for (i = 0; i < num_bits; i++) {
-                       set = 1;
-
-                       if (protection & (1 << i))
-                               set = 0;
-
-                       for (s = 0; s < stm32x_info->ppage_size; s++)
-                               bank->sectors[(i * stm32x_info->ppage_size) + s].is_protected = set;
-               }
-       }
+       for (unsigned int i = 0; i < bank->num_prot_blocks; i++)
+               bank->prot_blocks[i].is_protected = (protection & (1 << i)) ? 0 : 1;
 
        return ERROR_OK;
 }
 
-static int stm32x_erase(struct flash_bank *bank, int first, int last)
+static int stm32x_erase(struct flash_bank *bank, unsigned int first,
+               unsigned int last)
 {
        struct target *target = bank->target;
-       int i;
 
        if (bank->target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
@@ -443,7 +386,7 @@ static int stm32x_erase(struct flash_bank *bank, int first, int last)
        if (retval != ERROR_OK)
                return retval;
 
-       for (i = first; i <= last; i++) {
+       for (unsigned int i = first; i <= last; i++) {
                retval = target_write_u32(target, stm32x_get_flash_reg(bank, STM32_FLASH_CR), FLASH_PER);
                if (retval != ERROR_OK)
                        return retval;
@@ -459,8 +402,6 @@ static int stm32x_erase(struct flash_bank *bank, int first, int last)
                retval = stm32x_wait_status_busy(bank, FLASH_ERASE_TIMEOUT);
                if (retval != ERROR_OK)
                        return retval;
-
-               bank->sectors[i].is_erased = 1;
        }
 
        retval = target_write_u32(target, stm32x_get_flash_reg(bank, STM32_FLASH_CR), FLASH_LOCK);
@@ -470,16 +411,11 @@ static int stm32x_erase(struct flash_bank *bank, int first, int last)
        return ERROR_OK;
 }
 
-static int stm32x_protect(struct flash_bank *bank, int set, int first, int last)
+static int stm32x_protect(struct flash_bank *bank, int set, unsigned int first,
+               unsigned int last)
 {
-       struct stm32x_flash_bank *stm32x_info = NULL;
        struct target *target = bank->target;
-       uint16_t prot_reg[4] = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF};
-       int i, reg, bit;
-       int status;
-       uint32_t protection;
-
-       stm32x_info = bank->driver_priv;
+       struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
 
        if (target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
@@ -487,135 +423,39 @@ static int stm32x_protect(struct flash_bank *bank, int set, int first, int last)
        }
 
        int retval = stm32x_check_operation_supported(bank);
-       if (ERROR_OK != retval)
-               return retval;
-
-       if ((first % stm32x_info->ppage_size) != 0) {
-               LOG_WARNING("aligned start protect sector to a %d sector boundary",
-                               stm32x_info->ppage_size);
-               first = first - (first % stm32x_info->ppage_size);
-       }
-       if (((last + 1) % stm32x_info->ppage_size) != 0) {
-               LOG_WARNING("aligned end protect sector to a %d sector boundary",
-                               stm32x_info->ppage_size);
-               last++;
-               last = last - (last % stm32x_info->ppage_size);
-               last--;
-       }
-
-       /* medium density - each bit refers to a 4bank protection
-        * high density - each bit refers to a 2bank protection */
-       retval = target_read_u32(target, STM32_FLASH_WRPR_B0, &protection);
        if (retval != ERROR_OK)
                return retval;
 
-       prot_reg[0] = (uint16_t)protection;
-       prot_reg[1] = (uint16_t)(protection >> 8);
-       prot_reg[2] = (uint16_t)(protection >> 16);
-       prot_reg[3] = (uint16_t)(protection >> 24);
-
-       if (stm32x_info->ppage_size == 2) {
-               /* high density flash */
-
-               /* bit 7 controls sector 62 - 255 protection */
-               if (last > 61) {
-                       if (set)
-                               prot_reg[3] &= ~(1 << 7);
-                       else
-                               prot_reg[3] |= (1 << 7);
-               }
-
-               if (first > 61)
-                       first = 62;
-               if (last > 61)
-                       last = 61;
-
-               for (i = first; i <= last; i++) {
-                       reg = (i / stm32x_info->ppage_size) / 8;
-                       bit = (i / stm32x_info->ppage_size) - (reg * 8);
-
-                       if (set)
-                               prot_reg[reg] &= ~(1 << bit);
-                       else
-                               prot_reg[reg] |= (1 << bit);
-               }
-       } else {
-               /* medium density flash */
-               for (i = first; i <= last; i++) {
-                       reg = (i / stm32x_info->ppage_size) / 8;
-                       bit = (i / stm32x_info->ppage_size) - (reg * 8);
-
-                       if (set)
-                               prot_reg[reg] &= ~(1 << bit);
-                       else
-                               prot_reg[reg] |= (1 << bit);
-               }
+       retval = stm32x_erase_options(bank);
+       if (retval != ERROR_OK) {
+               LOG_ERROR("stm32x failed to erase options");
+               return retval;
        }
 
-       status = stm32x_erase_options(bank);
-       if (status != ERROR_OK)
-               return status;
-
-       stm32x_info->option_bytes.protection[0] = prot_reg[0];
-       stm32x_info->option_bytes.protection[1] = prot_reg[1];
-       stm32x_info->option_bytes.protection[2] = prot_reg[2];
-       stm32x_info->option_bytes.protection[3] = prot_reg[3];
+       for (unsigned int i = first; i <= last; i++) {
+               if (set)
+                       stm32x_info->option_bytes.protection &= ~(1 << i);
+               else
+                       stm32x_info->option_bytes.protection |= (1 << i);
+       }
 
        return stm32x_write_options(bank);
 }
 
-static int stm32x_write_block(struct flash_bank *bank, uint8_t *buffer,
-               uint32_t offset, uint32_t count)
+static int stm32x_write_block(struct flash_bank *bank, const uint8_t *buffer,
+               uint32_t address, uint32_t count)
 {
        struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
        struct target *target = bank->target;
        uint32_t buffer_size = 16384;
        struct working_area *write_algorithm;
        struct working_area *source;
-       uint32_t address = bank->base + offset;
        struct reg_param reg_params[5];
        struct armv7m_algorithm armv7m_info;
        int retval = ERROR_OK;
 
-       /* see contrib/loaders/flash/stm32f1x.S for src */
-
        static const uint8_t stm32x_flash_write_code[] = {
-               /* #define STM32_FLASH_SR_OFFSET 0x0C */
-               /* wait_fifo: */
-                       0x16, 0x68,   /* ldr   r6, [r2, #0] */
-                       0x00, 0x2e,   /* cmp   r6, #0 */
-                       0x18, 0xd0,   /* beq   exit */
-                       0x55, 0x68,   /* ldr   r5, [r2, #4] */
-                       0xb5, 0x42,   /* cmp   r5, r6 */
-                       0xf9, 0xd0,   /* beq   wait_fifo */
-                       0x2e, 0x88,   /* ldrh  r6, [r5, #0] */
-                       0x26, 0x80,   /* strh  r6, [r4, #0] */
-                       0x02, 0x35,   /* adds  r5, #2 */
-                       0x02, 0x34,   /* adds  r4, #2 */
-               /* busy: */
-                       0xc6, 0x68,   /* ldr   r6, [r0, #STM32_FLASH_SR_OFFSET] */
-                       0x01, 0x27,   /* movs  r7, #1 */
-                       0x3e, 0x42,   /* tst   r6, r7 */
-                       0xfb, 0xd1,   /* bne   busy */
-                       0x14, 0x27,   /* movs  r7, #0x14 */
-                       0x3e, 0x42,   /* tst   r6, r7 */
-                       0x08, 0xd1,   /* bne   error */
-                       0x9d, 0x42,   /* cmp   r5, r3 */
-                       0x01, 0xd3,   /* bcc   no_wrap */
-                       0x15, 0x46,   /* mov   r5, r2 */
-                       0x08, 0x35,   /* adds  r5, #8 */
-               /* no_wrap: */
-                       0x55, 0x60,   /* str   r5, [r2, #4] */
-                       0x01, 0x39,   /* subs  r1, r1, #1 */
-                       0x00, 0x29,   /* cmp   r1, #0 */
-                       0x02, 0xd0,   /* beq   exit */
-                       0xe5, 0xe7,   /* b     wait_fifo */
-               /* error: */
-                       0x00, 0x20,   /* movs  r0, #0 */
-                       0x50, 0x60,   /* str   r0, [r2, #4] */
-               /* exit: */
-                       0x30, 0x46,   /* mov   r0, r6 */
-                       0x00, 0xbe,   /* bkpt  #0 */
+#include "../../../contrib/loaders/flash/stm32/stm32f1x.inc"
        };
 
        /* flash write code */
@@ -623,12 +463,14 @@ static int stm32x_write_block(struct flash_bank *bank, uint8_t *buffer,
                        &write_algorithm) != ERROR_OK) {
                LOG_WARNING("no working area available, can't do block memory writes");
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
-       };
+       }
 
        retval = target_write_buffer(target, write_algorithm->address,
                        sizeof(stm32x_flash_write_code), stm32x_flash_write_code);
-       if (retval != ERROR_OK)
+       if (retval != ERROR_OK) {
+               target_free_working_area(target, write_algorithm);
                return retval;
+       }
 
        /* memory buffer */
        while (target_alloc_working_area_try(target, buffer_size, &source) != ERROR_OK) {
@@ -642,7 +484,7 @@ static int stm32x_write_block(struct flash_bank *bank, uint8_t *buffer,
                        LOG_WARNING("no large enough working area available, can't do block memory writes");
                        return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
                }
-       };
+       }
 
        init_reg_param(&reg_params[0], "r0", 32, PARAM_IN_OUT); /* flash base (in), status (out) */
        init_reg_param(&reg_params[1], "r1", 32, PARAM_OUT);    /* count (halfword-16bit) */
@@ -695,7 +537,7 @@ static int stm32x_write_block(struct flash_bank *bank, uint8_t *buffer,
        return retval;
 }
 
-static int stm32x_write(struct flash_bank *bank, uint8_t *buffer,
+static int stm32x_write(struct flash_bank *bank, const uint8_t *buffer,
                uint32_t offset, uint32_t count)
 {
        struct target *target = bank->target;
@@ -717,13 +559,13 @@ static int stm32x_write(struct flash_bank *bank, uint8_t *buffer,
         * discrete accesses. */
        if (count & 1) {
                new_buffer = malloc(count + 1);
-               if (new_buffer == NULL) {
+               if (!new_buffer) {
                        LOG_ERROR("odd number of bytes to write and no memory for padding buffer");
                        return ERROR_FAIL;
                }
                LOG_INFO("odd number of bytes to write, padding with 0xff");
                buffer = memcpy(new_buffer, buffer, count);
-               buffer[count++] = 0xff;
+               new_buffer[count++] = 0xff;
        }
 
        uint32_t words_remaining = count / 2;
@@ -742,7 +584,7 @@ static int stm32x_write(struct flash_bank *bank, uint8_t *buffer,
                goto cleanup;
 
        /* try using a block write */
-       retval = stm32x_write_block(bank, buffer, offset, words_remaining);
+       retval = stm32x_write_block(bank, buffer, bank->base + offset, words_remaining);
 
        if (retval == ERROR_TARGET_RESOURCE_NOT_AVAILABLE) {
                /* if block write failed (no sufficient working area),
@@ -773,42 +615,41 @@ reset_pg_and_lock:
                retval = retval2;
 
 cleanup:
-       if (new_buffer)
-               free(new_buffer);
-
+       free(new_buffer);
        return retval;
 }
 
 static int stm32x_get_device_id(struct flash_bank *bank, uint32_t *device_id)
 {
-       /* This check the device CPUID core register to detect
-        * the M0 from the M3 devices. */
-
        struct target *target = bank->target;
-       uint32_t cpuid, device_id_register = 0;
+       struct cortex_m_common *cortex_m = target_to_cm(target);
+       uint32_t device_id_register = 0;
 
-       /* Get the CPUID from the ARM Core
-        * http://infocenter.arm.com/help/topic/com.arm.doc.ddi0432c/DDI0432C_cortex_m0_r0p0_trm.pdf 4.2.1 */
-       int retval = target_read_u32(target, 0xE000ED00, &cpuid);
-       if (retval != ERROR_OK)
-               return retval;
+       if (!target_was_examined(target)) {
+               LOG_ERROR("Target not examined yet");
+               return ERROR_FAIL;
+       }
 
-       if (((cpuid >> 4) & 0xFFF) == 0xC20) {
-               /* 0xC20 is M0 devices */
+       switch (cortex_m->core_info->partno) {
+       case CORTEX_M0_PARTNO: /* STM32F0x devices */
                device_id_register = 0x40015800;
-       } else if (((cpuid >> 4) & 0xFFF) == 0xC23) {
-               /* 0xC23 is M3 devices */
+               break;
+       case CORTEX_M3_PARTNO: /* STM32F1x devices */
                device_id_register = 0xE0042000;
-       } else if (((cpuid >> 4) & 0xFFF) == 0xC24) {
-               /* 0xC24 is M4 devices */
+               break;
+       case CORTEX_M4_PARTNO: /* STM32F3x devices */
                device_id_register = 0xE0042000;
-       } else {
+               break;
+       case CORTEX_M23_PARTNO: /* GD32E23x devices */
+               device_id_register = 0x40015800;
+               break;
+       default:
                LOG_ERROR("Cannot identify target as a stm32x");
                return ERROR_FAIL;
        }
 
        /* read stm32 device id register */
-       retval = target_read_u32(target, device_id_register, device_id);
+       int retval = target_read_u32(target, device_id_register, device_id);
        if (retval != ERROR_OK)
                return retval;
 
@@ -818,27 +659,33 @@ static int stm32x_get_device_id(struct flash_bank *bank, uint32_t *device_id)
 static int stm32x_get_flash_size(struct flash_bank *bank, uint16_t *flash_size_in_kb)
 {
        struct target *target = bank->target;
-       uint32_t cpuid, flash_size_reg;
+       struct cortex_m_common *cortex_m = target_to_cm(target);
+       uint32_t flash_size_reg;
 
-       int retval = target_read_u32(target, 0xE000ED00, &cpuid);
-       if (retval != ERROR_OK)
-               return retval;
+       if (!target_was_examined(target)) {
+               LOG_ERROR("Target not examined yet");
+               return ERROR_FAIL;
+       }
 
-       if (((cpuid >> 4) & 0xFFF) == 0xC20) {
-               /* 0xC20 is M0 devices */
+       switch (cortex_m->core_info->partno) {
+       case CORTEX_M0_PARTNO: /* STM32F0x devices */
                flash_size_reg = 0x1FFFF7CC;
-       } else if (((cpuid >> 4) & 0xFFF) == 0xC23) {
-               /* 0xC23 is M3 devices */
+               break;
+       case CORTEX_M3_PARTNO: /* STM32F1x devices */
                flash_size_reg = 0x1FFFF7E0;
-       } else if (((cpuid >> 4) & 0xFFF) == 0xC24) {
-               /* 0xC24 is M4 devices */
+               break;
+       case CORTEX_M4_PARTNO: /* STM32F3x devices */
                flash_size_reg = 0x1FFFF7CC;
-       } else {
+               break;
+       case CORTEX_M23_PARTNO: /* GD32E23x devices */
+               flash_size_reg = 0x1FFFF7E0;
+               break;
+       default:
                LOG_ERROR("Cannot identify target as a stm32x");
                return ERROR_FAIL;
        }
 
-       retval = target_read_u16(target, flash_size_reg, flash_size_in_kb);
+       int retval = target_read_u16(target, flash_size_reg, flash_size_in_kb);
        if (retval != ERROR_OK)
                return retval;
 
@@ -848,73 +695,146 @@ static int stm32x_get_flash_size(struct flash_bank *bank, uint16_t *flash_size_i
 static int stm32x_probe(struct flash_bank *bank)
 {
        struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
-       int i;
        uint16_t flash_size_in_kb;
        uint16_t max_flash_size_in_kb;
-       uint32_t device_id;
+       uint32_t dbgmcu_idcode;
        int page_size;
        uint32_t base_address = 0x08000000;
 
-       stm32x_info->probed = 0;
+       stm32x_info->probed = false;
        stm32x_info->register_base = FLASH_REG_BASE_B0;
        stm32x_info->user_data_offset = 10;
        stm32x_info->option_offset = 0;
 
-       /* default factory protection level */
-       stm32x_info->default_rdp = 0x5AA5;
+       /* default factory read protection level 0 */
+       stm32x_info->default_rdp = 0xA5;
 
        /* read stm32 device id register */
-       int retval = stm32x_get_device_id(bank, &device_id);
+       int retval = stm32x_get_device_id(bank, &dbgmcu_idcode);
        if (retval != ERROR_OK)
                return retval;
 
-       LOG_INFO("device id = 0x%08" PRIx32 "", device_id);
+       LOG_INFO("device id = 0x%08" PRIx32 "", dbgmcu_idcode);
+
+       uint16_t device_id = dbgmcu_idcode & 0xfff;
+       uint16_t rev_id = dbgmcu_idcode >> 16;
 
        /* set page size, protection granularity and max flash size depending on family */
-       switch (device_id & 0xfff) {
-       case 0x410: /* medium density */
+       switch (device_id) {
+       case 0x440: /* stm32f05x */
                page_size = 1024;
                stm32x_info->ppage_size = 4;
+               max_flash_size_in_kb = 64;
+               stm32x_info->user_data_offset = 16;
+               stm32x_info->option_offset = 6;
+               stm32x_info->default_rdp = 0xAA;
+               stm32x_info->can_load_options = true;
+               break;
+       case 0x444: /* stm32f03x */
+       case 0x445: /* stm32f04x */
+               page_size = 1024;
+               stm32x_info->ppage_size = 4;
+               max_flash_size_in_kb = 32;
+               stm32x_info->user_data_offset = 16;
+               stm32x_info->option_offset = 6;
+               stm32x_info->default_rdp = 0xAA;
+               stm32x_info->can_load_options = true;
+               break;
+       case 0x448: /* stm32f07x */
+               page_size = 2048;
+               stm32x_info->ppage_size = 4;
                max_flash_size_in_kb = 128;
+               stm32x_info->user_data_offset = 16;
+               stm32x_info->option_offset = 6;
+               stm32x_info->default_rdp = 0xAA;
+               stm32x_info->can_load_options = true;
+               break;
+       case 0x442: /* stm32f09x */
+               page_size = 2048;
+               stm32x_info->ppage_size = 4;
+               max_flash_size_in_kb = 256;
+               stm32x_info->user_data_offset = 16;
+               stm32x_info->option_offset = 6;
+               stm32x_info->default_rdp = 0xAA;
+               stm32x_info->can_load_options = true;
+               break;
+       case 0x410: /* stm32f1x medium-density */
+               page_size = 1024;
+               stm32x_info->ppage_size = 4;
+               max_flash_size_in_kb = 128;
+               /* GigaDevice GD32F1x0 & GD32F3x0 & GD32E23x series devices
+                  share DEV_ID with STM32F101/2/3 medium-density line,
+                  however they use a REV_ID different from any STM32 device.
+                  The main difference is another offset of user option bits
+                  (like WDG_SW, nRST_STOP, nRST_STDBY) in option byte register
+                  (FLASH_OBR/FMC_OBSTAT 0x4002201C).
+                  This caused problems e.g. during flash block programming
+                  because of unexpected active hardware watchog. */
+               switch (rev_id) {
+               case 0x1303: /* gd32f1x0 */
+                       stm32x_info->user_data_offset = 16;
+                       stm32x_info->option_offset = 6;
+                       max_flash_size_in_kb = 64;
+                       break;
+               case 0x1704: /* gd32f3x0 */
+                       stm32x_info->user_data_offset = 16;
+                       stm32x_info->option_offset = 6;
+                       break;
+               case 0x1909: /* gd32e23x */
+                       stm32x_info->user_data_offset = 16;
+                       stm32x_info->option_offset = 6;
+                       max_flash_size_in_kb = 64;
+                       break;
+               }
                break;
-       case 0x412: /* low density */
+       case 0x412: /* stm32f1x low-density */
                page_size = 1024;
                stm32x_info->ppage_size = 4;
                max_flash_size_in_kb = 32;
                break;
-       case 0x414: /* high density */
+       case 0x414: /* stm32f1x high-density */
                page_size = 2048;
                stm32x_info->ppage_size = 2;
                max_flash_size_in_kb = 512;
                break;
-       case 0x418: /* connectivity line density */
+       case 0x418: /* stm32f1x connectivity */
                page_size = 2048;
                stm32x_info->ppage_size = 2;
                max_flash_size_in_kb = 256;
                break;
-       case 0x420: /* value line density */
+       case 0x430: /* stm32f1 XL-density (dual flash banks) */
+               page_size = 2048;
+               stm32x_info->ppage_size = 2;
+               max_flash_size_in_kb = 1024;
+               stm32x_info->has_dual_banks = true;
+               break;
+       case 0x420: /* stm32f100xx low- and medium-density value line */
                page_size = 1024;
                stm32x_info->ppage_size = 4;
                max_flash_size_in_kb = 128;
                break;
-       case 0x422: /* stm32f30x */
+       case 0x428: /* stm32f100xx high-density value line */
+               page_size = 2048;
+               stm32x_info->ppage_size = 4;
+               max_flash_size_in_kb = 512;
+               break;
+       case 0x422: /* stm32f302/3xb/c */
                page_size = 2048;
                stm32x_info->ppage_size = 2;
                max_flash_size_in_kb = 256;
                stm32x_info->user_data_offset = 16;
                stm32x_info->option_offset = 6;
-               stm32x_info->default_rdp = 0x55AA;
-               break;
-       case 0x428: /* value line High density */
-               page_size = 2048;
-               stm32x_info->ppage_size = 4;
-               max_flash_size_in_kb = 128;
+               stm32x_info->default_rdp = 0xAA;
+               stm32x_info->can_load_options = true;
                break;
-       case 0x430: /* xl line density (dual flash banks) */
+       case 0x446: /* stm32f303xD/E */
                page_size = 2048;
                stm32x_info->ppage_size = 2;
-               max_flash_size_in_kb = 1024;
-               stm32x_info->has_dual_banks = true;
+               max_flash_size_in_kb = 512;
+               stm32x_info->user_data_offset = 16;
+               stm32x_info->option_offset = 6;
+               stm32x_info->default_rdp = 0xAA;
+               stm32x_info->can_load_options = true;
                break;
        case 0x432: /* stm32f37x */
                page_size = 2048;
@@ -922,16 +842,18 @@ static int stm32x_probe(struct flash_bank *bank)
                max_flash_size_in_kb = 256;
                stm32x_info->user_data_offset = 16;
                stm32x_info->option_offset = 6;
-               stm32x_info->default_rdp = 0x55AA;
+               stm32x_info->default_rdp = 0xAA;
+               stm32x_info->can_load_options = true;
                break;
-       case 0x440: /* stm32f0x */
-       case 0x444:
-               page_size = 1024;
-               stm32x_info->ppage_size = 4;
+       case 0x438: /* stm32f33x */
+       case 0x439: /* stm32f302x6/8 */
+               page_size = 2048;
+               stm32x_info->ppage_size = 2;
                max_flash_size_in_kb = 64;
                stm32x_info->user_data_offset = 16;
                stm32x_info->option_offset = 6;
-               stm32x_info->default_rdp = 0x55AA;
+               stm32x_info->default_rdp = 0xAA;
+               stm32x_info->can_load_options = true;
                break;
        default:
                LOG_WARNING("Cannot identify target as a STM32 family.");
@@ -980,24 +902,34 @@ static int stm32x_probe(struct flash_bank *bank)
        /* check that calculation result makes sense */
        assert(num_pages > 0);
 
-       if (bank->sectors) {
-               free(bank->sectors);
-               bank->sectors = NULL;
-       }
+       free(bank->sectors);
+       bank->sectors = NULL;
+
+       free(bank->prot_blocks);
+       bank->prot_blocks = NULL;
 
        bank->base = base_address;
        bank->size = (num_pages * page_size);
+
        bank->num_sectors = num_pages;
-       bank->sectors = malloc(sizeof(struct flash_sector) * num_pages);
+       bank->sectors = alloc_block_array(0, page_size, num_pages);
+       if (!bank->sectors)
+               return ERROR_FAIL;
 
-       for (i = 0; i < num_pages; i++) {
-               bank->sectors[i].offset = i * page_size;
-               bank->sectors[i].size = page_size;
-               bank->sectors[i].is_erased = -1;
-               bank->sectors[i].is_protected = 1;
-       }
+       /* calculate number of write protection blocks */
+       int num_prot_blocks = num_pages / stm32x_info->ppage_size;
+       if (num_prot_blocks > 32)
+               num_prot_blocks = 32;
+
+       bank->num_prot_blocks = num_prot_blocks;
+       bank->prot_blocks = alloc_block_array(0, stm32x_info->ppage_size * page_size, num_prot_blocks);
+       if (!bank->prot_blocks)
+               return ERROR_FAIL;
 
-       stm32x_info->probed = 1;
+       if (num_prot_blocks == 32)
+               bank->prot_blocks[31].size = (num_pages - (31 * stm32x_info->ppage_size)) * page_size;
+
+       stm32x_info->probed = true;
 
        return ERROR_OK;
 }
@@ -1017,11 +949,26 @@ COMMAND_HANDLER(stm32x_handle_part_id_command)
 }
 #endif
 
-static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
+static const char *get_stm32f0_revision(uint16_t rev_id)
+{
+       const char *rev_str = NULL;
+
+       switch (rev_id) {
+       case 0x1000:
+               rev_str = "1.0";
+               break;
+       case 0x2000:
+               rev_str = "2.0";
+               break;
+       }
+       return rev_str;
+}
+
+static int get_stm32x_info(struct flash_bank *bank, struct command_invocation *cmd)
 {
        uint32_t dbgmcu_idcode;
 
-               /* read stm32 device id register */
+       /* read stm32 device id register */
        int retval = stm32x_get_device_id(bank, &dbgmcu_idcode);
        if (retval != ERROR_OK)
                return retval;
@@ -1040,6 +987,18 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
                        rev_str = "A";
                        break;
 
+               case 0x1303: /* gd32f1x0 */
+                       device_str = "GD32F1x0";
+                       break;
+
+               case 0x1704: /* gd32f3x0 */
+                       device_str = "GD32F3x0";
+                       break;
+
+               case 0x1909: /* gd32e23x */
+                       device_str = "GD32E23x";
+                       break;
+
                case 0x2000:
                        rev_str = "B";
                        break;
@@ -1111,7 +1070,7 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
                break;
 
        case 0x422:
-               device_str = "STM32F30x";
+               device_str = "STM32F302xB/C";
 
                switch (rev_id) {
                case 0x1000:
@@ -1170,30 +1129,73 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
                }
                break;
 
-       case 0x440:
-       case 0x444:
-               device_str = "STM32F0xx";
+       case 0x438:
+               device_str = "STM32F33x";
+
+               switch (rev_id) {
+               case 0x1000:
+                       rev_str = "A";
+                       break;
+               }
+               break;
+
+       case 0x439:
+               device_str = "STM32F302x6/8";
 
                switch (rev_id) {
                case 0x1000:
-                       rev_str = "1.0";
+                       rev_str = "A";
                        break;
 
-               case 0x2000:
-                       rev_str = "2.0";
+               case 0x1001:
+                       rev_str = "Z";
                        break;
                }
                break;
 
+       case 0x444:
+               device_str = "STM32F03x";
+               rev_str = get_stm32f0_revision(rev_id);
+               break;
+
+       case 0x440:
+               device_str = "STM32F05x";
+               rev_str = get_stm32f0_revision(rev_id);
+               break;
+
+       case 0x445:
+               device_str = "STM32F04x";
+               rev_str = get_stm32f0_revision(rev_id);
+               break;
+
+       case 0x446:
+               device_str = "STM32F303xD/E";
+               switch (rev_id) {
+               case 0x1000:
+                       rev_str = "A";
+                       break;
+               }
+               break;
+
+       case 0x448:
+               device_str = "STM32F07x";
+               rev_str = get_stm32f0_revision(rev_id);
+               break;
+
+       case 0x442:
+               device_str = "STM32F09x";
+               rev_str = get_stm32f0_revision(rev_id);
+               break;
+
        default:
-               snprintf(buf, buf_size, "Cannot identify target as a STM32F0/1/3\n");
+               command_print_sameline(cmd, "Cannot identify target as a STM32F0/1/3\n");
                return ERROR_FAIL;
        }
 
-       if (rev_str != NULL)
-               snprintf(buf, buf_size, "%s - Rev: %s", device_str, rev_str);
+       if (rev_str)
+               command_print_sameline(cmd, "%s - Rev: %s", device_str, rev_str);
        else
-               snprintf(buf, buf_size, "%s - Rev: unknown (0x%04x)", device_str, rev_id);
+               command_print_sameline(cmd, "%s - Rev: unknown (0x%04x)", device_str, rev_id);
 
        return ERROR_OK;
 }
@@ -1208,7 +1210,7 @@ COMMAND_HANDLER(stm32x_handle_lock_command)
 
        struct flash_bank *bank;
        int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
 
        stm32x_info = bank->driver_priv;
@@ -1221,23 +1223,23 @@ COMMAND_HANDLER(stm32x_handle_lock_command)
        }
 
        retval = stm32x_check_operation_supported(bank);
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
 
        if (stm32x_erase_options(bank) != ERROR_OK) {
-               command_print(CMD_CTX, "stm32x failed to erase options");
+               command_print(CMD, "stm32x failed to erase options");
                return ERROR_OK;
        }
 
        /* set readout protection */
-       stm32x_info->option_bytes.RDP = 0;
+       stm32x_info->option_bytes.rdp = 0;
 
        if (stm32x_write_options(bank) != ERROR_OK) {
-               command_print(CMD_CTX, "stm32x failed to lock device");
+               command_print(CMD, "stm32x failed to lock device");
                return ERROR_OK;
        }
 
-       command_print(CMD_CTX, "stm32x locked");
+       command_print(CMD, "stm32x locked");
 
        return ERROR_OK;
 }
@@ -1251,7 +1253,7 @@ COMMAND_HANDLER(stm32x_handle_unlock_command)
 
        struct flash_bank *bank;
        int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
 
        target = bank->target;
@@ -1262,20 +1264,20 @@ COMMAND_HANDLER(stm32x_handle_unlock_command)
        }
 
        retval = stm32x_check_operation_supported(bank);
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
 
        if (stm32x_erase_options(bank) != ERROR_OK) {
-               command_print(CMD_CTX, "stm32x failed to unlock device");
+               command_print(CMD, "stm32x failed to erase options");
                return ERROR_OK;
        }
 
        if (stm32x_write_options(bank) != ERROR_OK) {
-               command_print(CMD_CTX, "stm32x failed to lock device");
+               command_print(CMD, "stm32x failed to unlock device");
                return ERROR_OK;
        }
 
-       command_print(CMD_CTX, "stm32x unlocked.\n"
+       command_print(CMD, "stm32x unlocked.\n"
                        "INFO: a reset or power cycle is required "
                        "for the new settings to take effect.");
 
@@ -1284,7 +1286,7 @@ COMMAND_HANDLER(stm32x_handle_unlock_command)
 
 COMMAND_HANDLER(stm32x_handle_options_read_command)
 {
-       uint32_t optionbyte;
+       uint32_t optionbyte, protection;
        struct target *target = NULL;
        struct stm32x_flash_bank *stm32x_info = NULL;
 
@@ -1293,7 +1295,7 @@ COMMAND_HANDLER(stm32x_handle_options_read_command)
 
        struct flash_bank *bank;
        int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
 
        stm32x_info = bank->driver_priv;
@@ -1306,53 +1308,44 @@ COMMAND_HANDLER(stm32x_handle_options_read_command)
        }
 
        retval = stm32x_check_operation_supported(bank);
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
 
        retval = target_read_u32(target, STM32_FLASH_OBR_B0, &optionbyte);
        if (retval != ERROR_OK)
                return retval;
-       command_print(CMD_CTX, "Option Byte: 0x%" PRIx32 "", optionbyte);
 
-       int user_data = optionbyte;
+       uint16_t user_data = optionbyte >> stm32x_info->user_data_offset;
 
-       if (optionbyte >> OPT_ERROR & 1)
-               command_print(CMD_CTX, "Option Byte Complement Error");
+       retval = target_read_u32(target, STM32_FLASH_WRPR_B0, &protection);
+       if (retval != ERROR_OK)
+               return retval;
 
-       if (optionbyte >> OPT_READOUT & 1)
-               command_print(CMD_CTX, "Readout Protection On");
-       else
-               command_print(CMD_CTX, "Readout Protection Off");
+       if (optionbyte & (1 << OPT_ERROR))
+               command_print(CMD, "option byte complement error");
+
+       command_print(CMD, "option byte register = 0x%" PRIx32 "", optionbyte);
+       command_print(CMD, "write protection register = 0x%" PRIx32 "", protection);
+
+       command_print(CMD, "read protection: %s",
+                               (optionbyte & (1 << OPT_READOUT)) ? "on" : "off");
 
        /* user option bytes are offset depending on variant */
        optionbyte >>= stm32x_info->option_offset;
 
-       if (optionbyte >> OPT_RDWDGSW & 1)
-               command_print(CMD_CTX, "Software Watchdog");
-       else
-               command_print(CMD_CTX, "Hardware Watchdog");
+       command_print(CMD, "watchdog: %sware",
+                               (optionbyte & (1 << OPT_RDWDGSW)) ? "soft" : "hard");
 
-       if (optionbyte >> OPT_RDRSTSTOP & 1)
-               command_print(CMD_CTX, "Stop: No reset generated");
-       else
-               command_print(CMD_CTX, "Stop: Reset generated");
+       command_print(CMD, "stop mode: %sreset generated upon entry",
+                               (optionbyte & (1 << OPT_RDRSTSTOP)) ? "no " : "");
 
-       if (optionbyte >> OPT_RDRSTSTDBY & 1)
-               command_print(CMD_CTX, "Standby: No reset generated");
-       else
-               command_print(CMD_CTX, "Standby: Reset generated");
+       command_print(CMD, "standby mode: %sreset generated upon entry",
+                               (optionbyte & (1 << OPT_RDRSTSTDBY)) ? "no " : "");
 
-       if (stm32x_info->has_dual_banks) {
-               if (optionbyte >> OPT_BFB2 & 1)
-                       command_print(CMD_CTX, "Boot: Bank 0");
-               else
-                       command_print(CMD_CTX, "Boot: Bank 1");
-       }
+       if (stm32x_info->has_dual_banks)
+               command_print(CMD, "boot: bank %d", (optionbyte & (1 << OPT_BFB2)) ? 0 : 1);
 
-       command_print(CMD_CTX, "User Option0: 0x%02" PRIx8,
-                       (user_data >> stm32x_info->user_data_offset) & 0xff);
-       command_print(CMD_CTX, "User Option1: 0x%02" PRIx8,
-                       (user_data >> (stm32x_info->user_data_offset + 8)) & 0xff);
+       command_print(CMD, "user data = 0x%02" PRIx16 "", user_data);
 
        return ERROR_OK;
 }
@@ -1361,14 +1354,15 @@ COMMAND_HANDLER(stm32x_handle_options_write_command)
 {
        struct target *target = NULL;
        struct stm32x_flash_bank *stm32x_info = NULL;
-       uint16_t optionbyte;
+       uint8_t optionbyte;
+       uint16_t useropt;
 
        if (CMD_ARGC < 2)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        struct flash_bank *bank;
        int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
 
        stm32x_info = bank->driver_priv;
@@ -1381,15 +1375,16 @@ COMMAND_HANDLER(stm32x_handle_options_write_command)
        }
 
        retval = stm32x_check_operation_supported(bank);
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
 
        retval = stm32x_read_options(bank);
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
 
        /* start with current options */
-       optionbyte = stm32x_info->option_bytes.user_options;
+       optionbyte = stm32x_info->option_bytes.user;
+       useropt = stm32x_info->option_bytes.data;
 
        /* skip over flash bank */
        CMD_ARGC--;
@@ -1401,14 +1396,20 @@ COMMAND_HANDLER(stm32x_handle_options_write_command)
                else if (strcmp("HWWDG", CMD_ARGV[0]) == 0)
                        optionbyte &= ~(1 << 0);
                else if (strcmp("NORSTSTOP", CMD_ARGV[0]) == 0)
-                       optionbyte &= ~(1 << 1);
-               else if (strcmp("RSTSTNDBY", CMD_ARGV[0]) == 0)
+                       optionbyte |= (1 << 1);
+               else if (strcmp("RSTSTOP", CMD_ARGV[0]) == 0)
                        optionbyte &= ~(1 << 1);
                else if (strcmp("NORSTSTNDBY", CMD_ARGV[0]) == 0)
+                       optionbyte |= (1 << 2);
+               else if (strcmp("RSTSTNDBY", CMD_ARGV[0]) == 0)
                        optionbyte &= ~(1 << 2);
-               else if (strcmp("RSTSTOP", CMD_ARGV[0]) == 0)
-                       optionbyte &= ~(1 << 2);
-               else if (stm32x_info->has_dual_banks) {
+               else if (strcmp("USEROPT", CMD_ARGV[0]) == 0) {
+                       if (CMD_ARGC < 2)
+                               return ERROR_COMMAND_SYNTAX_ERROR;
+                       COMMAND_PARSE_NUMBER(u16, CMD_ARGV[1], useropt);
+                       CMD_ARGC--;
+                       CMD_ARGV++;
+               } else if (stm32x_info->has_dual_banks) {
                        if (strcmp("BOOT0", CMD_ARGV[0]) == 0)
                                optionbyte |= (1 << 3);
                        else if (strcmp("BOOT1", CMD_ARGV[0]) == 0)
@@ -1422,20 +1423,68 @@ COMMAND_HANDLER(stm32x_handle_options_write_command)
        }
 
        if (stm32x_erase_options(bank) != ERROR_OK) {
-               command_print(CMD_CTX, "stm32x failed to erase options");
+               command_print(CMD, "stm32x failed to erase options");
                return ERROR_OK;
        }
 
-       stm32x_info->option_bytes.user_options = optionbyte;
+       stm32x_info->option_bytes.user = optionbyte;
+       stm32x_info->option_bytes.data = useropt;
 
        if (stm32x_write_options(bank) != ERROR_OK) {
-               command_print(CMD_CTX, "stm32x failed to write options");
+               command_print(CMD, "stm32x failed to write options");
                return ERROR_OK;
        }
 
-       command_print(CMD_CTX, "stm32x write options complete.\n"
-                               "INFO: a reset or power cycle is required "
-                               "for the new settings to take effect.");
+       command_print(CMD, "stm32x write options complete.\n"
+                               "INFO: %spower cycle is required "
+                               "for the new settings to take effect.",
+                               stm32x_info->can_load_options
+                                       ? "'stm32f1x options_load' command or " : "");
+
+       return ERROR_OK;
+}
+
+COMMAND_HANDLER(stm32x_handle_options_load_command)
+{
+       if (CMD_ARGC < 1)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
+       struct flash_bank *bank;
+       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
+       if (retval != ERROR_OK)
+               return retval;
+
+       struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
+
+       if (!stm32x_info->can_load_options) {
+               LOG_ERROR("Command not applicable to stm32f1x devices - power cycle is "
+                       "required instead.");
+               return ERROR_FAIL;
+       }
+
+       struct target *target = bank->target;
+
+       if (target->state != TARGET_HALTED) {
+               LOG_ERROR("Target not halted");
+               return ERROR_TARGET_NOT_HALTED;
+       }
+
+       retval = stm32x_check_operation_supported(bank);
+       if (retval != ERROR_OK)
+               return retval;
+
+       /* unlock option flash registers */
+       retval = target_write_u32(target, stm32x_get_flash_reg(bank, STM32_FLASH_KEYR), KEY1);
+       if (retval != ERROR_OK)
+               return retval;
+       retval = target_write_u32(target, stm32x_get_flash_reg(bank, STM32_FLASH_KEYR), KEY2);
+       if (retval != ERROR_OK)
+               return retval;
+
+       /* force re-load of option bytes - generates software reset */
+       retval = target_write_u32(target, stm32x_get_flash_reg(bank, STM32_FLASH_CR), FLASH_OBL_LAUNCH);
+       if (retval != ERROR_OK)
+               return retval;
 
        return ERROR_OK;
 }
@@ -1479,25 +1528,19 @@ static int stm32x_mass_erase(struct flash_bank *bank)
 
 COMMAND_HANDLER(stm32x_handle_mass_erase_command)
 {
-       int i;
-
        if (CMD_ARGC < 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        struct flash_bank *bank;
        int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
 
        retval = stm32x_mass_erase(bank);
-       if (retval == ERROR_OK) {
-               /* set all sectors as erased */
-               for (i = 0; i < bank->num_sectors; i++)
-                       bank->sectors[i].is_erased = 1;
-
-               command_print(CMD_CTX, "stm32x mass erase complete");
-       } else
-               command_print(CMD_CTX, "stm32x mass erase failed");
+       if (retval == ERROR_OK)
+               command_print(CMD, "stm32x mass erase complete");
+       else
+               command_print(CMD, "stm32x mass erase failed");
 
        return retval;
 }
@@ -1529,7 +1572,7 @@ static const struct command_registration stm32x_exec_command_handlers[] = {
                .handler = stm32x_handle_options_read_command,
                .mode = COMMAND_EXEC,
                .usage = "bank_id",
-               .help = "Read and display device option byte.",
+               .help = "Read and display device option bytes.",
        },
        {
                .name = "options_write",
@@ -1537,8 +1580,15 @@ static const struct command_registration stm32x_exec_command_handlers[] = {
                .mode = COMMAND_EXEC,
                .usage = "bank_id ('SWWDG'|'HWWDG') "
                        "('RSTSTNDBY'|'NORSTSTNDBY') "
-                       "('RSTSTOP'|'NORSTSTOP')",
-               .help = "Replace bits in device option byte.",
+                       "('RSTSTOP'|'NORSTSTOP') ('USEROPT' user_data)",
+               .help = "Replace bits in device option bytes.",
+       },
+       {
+               .name = "options_load",
+               .handler = stm32x_handle_options_load_command,
+               .mode = COMMAND_EXEC,
+               .usage = "bank_id",
+               .help = "Force re-load of device option bytes.",
        },
        COMMAND_REGISTRATION_DONE
 };
@@ -1554,7 +1604,7 @@ static const struct command_registration stm32x_command_handlers[] = {
        COMMAND_REGISTRATION_DONE
 };
 
-struct flash_driver stm32f1x_flash = {
+const struct flash_driver stm32f1x_flash = {
        .name = "stm32f1x",
        .commands = stm32x_command_handlers,
        .flash_bank_command = stm32x_flash_bank_command,
@@ -1567,4 +1617,5 @@ struct flash_driver stm32f1x_flash = {
        .erase_check = default_flash_blank_check,
        .protect_check = stm32x_protect_check,
        .info = get_stm32x_info,
+       .free_driver_priv = default_flash_free_driver_priv,
 };