From: ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Tue, 29 Apr 2008 17:07:23 +0000 (+0000)
Subject: - stm32x default to 128k if flash size failed.
X-Git-Tag: v0.1.0~662
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=26414b39d4d151508bed35c35e5d34c38fd00cc5;p=openocd

- stm32x default to 128k if flash size failed.

git-svn-id: svn://svn.berlios.de/openocd/trunk@627 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---

diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c
index e85c0e5a..25a9b0da 100644
--- a/src/flash/stm32x.c
+++ b/src/flash/stm32x.c
@@ -627,7 +627,12 @@ int stm32x_probe(struct flash_bank_s *bank)
     }
     
 	/* get flash size from target */
-	target_read_u16(target, 0x1FFFF7E0, &num_sectors);
+	if (target_read_u16(target, 0x1FFFF7E0, &num_sectors) != ERROR_OK)
+	{
+		/* failed reading flash size, default to 128k */
+		LOG_WARNING( "STM32 flash size failed, probe inaccurate - assuming 128k flash" );
+		num_sectors = 128;
+	}
 	
 	/* check for early silicon rev A */
 	if ((device_id >> 16) == 0 )