aboutsummaryrefslogtreecommitdiff
path: root/src/flash/nor
diff options
context:
space:
mode:
authorSpencer Oliver <spen@spen-soft.co.uk>2013-12-13 21:23:25 +0000
committerAndreas Fritiofson <andreas.fritiofson@gmail.com>2013-12-14 21:46:44 +0000
commit242649c81c4528d80fa4643b550349e567139875 (patch)
treefb24ca31722ec9d04e94b23d22ef7132a7d1b1e3 /src/flash/nor
parentbb8c0d55d4fa72fe48ef70f17ee40324a355b73f (diff)
flash: revert incorrect stm32f1 default_padded_value
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>
Diffstat (limited to 'src/flash/nor')
-rw-r--r--src/flash/nor/stm32f1x.c3
-rw-r--r--src/flash/nor/stm32lx.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/src/flash/nor/stm32f1x.c b/src/flash/nor/stm32f1x.c
index af7d9ea3..ce0708f6 100644
--- a/src/flash/nor/stm32f1x.c
+++ b/src/flash/nor/stm32f1x.c
@@ -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;
}
diff --git a/src/flash/nor/stm32lx.c b/src/flash/nor/stm32lx.c
index b8b53062..eb4f96dd 100644
--- a/src/flash/nor/stm32lx.c
+++ b/src/flash/nor/stm32lx.c
@@ -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;
}