flash: use correct device_id mask

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

diff --git a/src/flash/nor/stm32lx.c b/src/flash/nor/stm32lx.c
index 32b3315d843c259f88a3d38b7c5f6f8d2cf7f9c7..2cd16d6f9773980c91476982249069c63b8707a1 100644 (file)
--- a/src/flash/nor/stm32lx.c
+++ b/src/flash/nor/stm32lx.c
@@ -130,8 +130,7 @@ FLASH_BANK_COMMAND_HANDLER(stm32lx_flash_bank_command)
        struct stm32lx_flash_bank *stm32lx_info;
        if (CMD_ARGC < 6)
        {
-               LOG_ERROR("incomplete flash_bank stm32lx configuration");
-               return ERROR_FLASH_BANK_INVALID;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        // Create the bank structure
@@ -465,17 +464,12 @@ static int stm32lx_write(struct flash_bank *bank, uint8_t *buffer,
 
        if (bytes_remaining)
        {
-               uint32_t value = 0;
-               for (int i = 0; i < 4; i++)
-               {
-                       if (bytes_remaining)
-                       {
-                               value += (buffer[i] << (8 * i));
-                               bytes_remaining--;
-                       }
-               }
+               uint8_t last_word[4] = {0xff, 0xff, 0xff, 0xff};
 
-               retval = target_write_u32(target, address, value);
+               /* copy the last remaining bytes into the write buffer */
+               memcpy(last_word, buffer+bytes_written, bytes_remaining);
+
+               retval = target_write_buffer(target, address, 4, last_word);
                if (retval != ERROR_OK)
                        return retval;
 
@@ -509,8 +503,7 @@ static int stm32lx_probe(struct flash_bank *bank)
 
        LOG_DEBUG("device id = 0x%08" PRIx32 "", device_id);
 
-       if ((device_id & 0x7ff) != 0x416)
-       {
+       if ((device_id & 0xfff) != 0x416) {
                LOG_WARNING("Cannot identify target as a STM32L family.");
                return ERROR_FAIL;
        }
@@ -708,8 +701,7 @@ static int stm32lx_get_info(struct flash_bank *bank, char *buf, int buf_size)
        if (retval != ERROR_OK)
                return retval;
 
-       if ((device_id & 0x7ff) == 0x416)
-       {
+       if ((device_id & 0xfff) == 0x416) {
                printed = snprintf(buf, buf_size, "stm32lx - Rev: ");
                buf += printed;
                buf_size -= printed;