flash: revert incorrect stm32f1 default_padded_value
authorSpencer Oliver <spen@spen-soft.co.uk>
Fri, 13 Dec 2013 21:23:25 +0000 (21:23 +0000)
committerAndreas Fritiofson <andreas.fritiofson@gmail.com>
Sat, 14 Dec 2013 21:46:44 +0000 (21:46 +0000)
Commit 2493671e2d9c352ea70edc8665b4c8f172ef1141 added a default flash
padded value to the wrong file, should have been stm32lx.c not stm32f1x.c.

Change-Id: Idab634a03ccb28609cc977a92ac2b138d1e8d859
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/1833
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
src/flash/nor/stm32f1x.c
src/flash/nor/stm32lx.c

index af7d9ea3970034cf04d446d12625cbb5bfb0231e..ce0708f65952da0921f417c4d89e01fcea820455 100644 (file)
@@ -150,9 +150,6 @@ FLASH_BANK_COMMAND_HANDLER(stm32x_flash_bank_command)
        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;
 }
 
index b8b530624c60ec1c50bd822adadb5be0b3607675..eb4f96ddca2eabce2ec92654e9ab484192580912 100644 (file)
@@ -149,6 +149,9 @@ FLASH_BANK_COMMAND_HANDLER(stm32lx_flash_bank_command)
        stm32lx_info->has_dual_banks = false;
        stm32lx_info->user_bank_size = bank->size;
 
+       /* the stm32l erased value is 0x00 */
+       bank->default_padded_value = 0x00;
+
        return ERROR_OK;
 }