From: OpenOCD-Gerrit <ope...@us...> - 2013-08-29 13:00:23
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Main OpenOCD repository". The branch, master has been updated via 017a202086603119793d8da56989591512d08ed0 (commit) from ef1f2c0a3d585718d0db4faadb115a15c8019849 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 017a202086603119793d8da56989591512d08ed0 Author: Spencer Oliver <sp...@sp...> Date: Tue Aug 6 14:36:12 2013 +0100 flash: fix stm32f1x dual bank detection Not all devices with devce id 0x419 have dual flash banks, only those with > 1024kB. Change-Id: I197d2b87df7599cd0837e25648af48439f2f1e50 Signed-off-by: Spencer Oliver <sp...@sp...> Reviewed-on: http://openocd.zylin.com/1544 Tested-by: jenkins diff --git a/src/flash/nor/stm32f2x.c b/src/flash/nor/stm32f2x.c index 89fad60..91baec4 100644 --- a/src/flash/nor/stm32f2x.c +++ b/src/flash/nor/stm32f2x.c @@ -770,7 +770,6 @@ static int stm32x_probe(struct flash_bank *bank) break; case 0x419: max_flash_size_in_kb = 2048; - stm32x_info->has_large_mem = true; break; case 0x423: max_flash_size_in_kb = 256; @@ -798,6 +797,10 @@ static int stm32x_probe(struct flash_bank *bank) flash_size_in_kb = stm32x_info->user_bank_size / 1024; } + /* only devices with > 1024kB have dual banks */ + if (flash_size_in_kb > 1024) + stm32x_info->has_large_mem = true; + LOG_INFO("flash size = %dkbytes", flash_size_in_kb); /* did we assign flash size? */ ----------------------------------------------------------------------- Summary of changes: src/flash/nor/stm32f2x.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) hooks/post-receive -- Main OpenOCD repository |