[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.5.0-635-g38e44d1

[OpenOCD-Gerrit <ope...@us...>]

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  38e44d1361a5dbefcbbc54cc8fd8b0bd53dbc89f (commit)
      from  055abd0b9cb3427fb9b52263d2be49620e8e4c97 (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 38e44d1361a5dbefcbbc54cc8fd8b0bd53dbc89f
Author: Spencer Oliver <sp...@sp...>
Date:   Thu Jul 12 12:30:31 2012 +0100

    flash: fix stm32 flash driver typo's
    
    Change-Id: I37f3fee063d7f8729e057dcfe8904651790439e6
    Signed-off-by: Spencer Oliver <sp...@sp...>
    Reviewed-on: http://openocd.zylin.com/745
    Tested-by: jenkins
    Reviewed-by: Freddie Chopin <fre...@gm...>

diff --git a/src/flash/nor/stm32f1x.c b/src/flash/nor/stm32f1x.c
index b6359a0..2a6604d 100644
--- a/src/flash/nor/stm32f1x.c
+++ b/src/flash/nor/stm32f1x.c
@@ -963,7 +963,7 @@ static int stm32x_probe(struct flash_bank *bank)
 
 		/* check for early silicon */
 		if (flash_size_in_kb == 0xffff) {
-			/* number of sectors may be incorrrect on early silicon */
+			/* number of sectors may be incorrect on early silicon */
 			LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 128k flash");
 			flash_size_in_kb = 128;
 		}
@@ -986,7 +986,7 @@ static int stm32x_probe(struct flash_bank *bank)
 
 		/* check for early silicon */
 		if (flash_size_in_kb == 0xffff) {
-			/* number of sectors may be incorrrect on early silicon */
+			/* number of sectors may be incorrect on early silicon */
 			LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 128k flash");
 			flash_size_in_kb = 128;
 		}
@@ -999,7 +999,7 @@ static int stm32x_probe(struct flash_bank *bank)
 
 		/* check for early silicon */
 		if (flash_size_in_kb == 0xffff) {
-			/* number of sectors may be incorrrect on early silicon */
+			/* number of sectors may be incorrect on early silicon */
 			LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 1024k flash");
 			flash_size_in_kb = 1024;
 		}
diff --git a/src/flash/nor/stm32f2x.c b/src/flash/nor/stm32f2x.c
index 5f5bfb8..c7abd6a 100644
--- a/src/flash/nor/stm32f2x.c
+++ b/src/flash/nor/stm32f2x.c
@@ -613,14 +613,14 @@ static int stm32x_probe(struct flash_bank *bank)
 	if ((device_id & 0xfff) == 0x411) {
 		/* check for early silicon */
 		if (flash_size_in_kb == 0xffff) {
-			/* number of sectors may be incorrrect on early silicon */
+			/* number of sectors may be incorrect on early silicon */
 			LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 1024k flash");
 			flash_size_in_kb = 1024;
 		}
 	} else if ((device_id & 0xfff) == 0x413) {
 		/* check for early silicon */
 		if (flash_size_in_kb == 0xffff) {
-			/* number of sectors may be incorrrect on early silicon */
+			/* number of sectors may be incorrect on early silicon */
 			LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 1024k flash");
 			flash_size_in_kb = 1024;
 		}
diff --git a/src/flash/nor/stm32lx.c b/src/flash/nor/stm32lx.c
index 27a446d..fedab30 100644
--- a/src/flash/nor/stm32lx.c
+++ b/src/flash/nor/stm32lx.c
@@ -490,14 +490,14 @@ static int stm32lx_probe(struct flash_bank *bank)
 	if ((device_id & 0xfff) == 0x416) {
 		/* check for early silicon */
 		if (flash_size_in_kb == 0xffff) {
-			/* number of sectors may be incorrrect on early silicon */
+			/* number of sectors may be incorrect on early silicon */
 			LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 128k flash");
 			flash_size_in_kb = 128;
 		}
 	} else if ((device_id & 0xfff) == 0x436) {
 		/* check for early silicon */
 		if (flash_size_in_kb == 0xffff) {
-			/* number of sectors may be incorrrect on early silicon */
+			/* number of sectors may be incorrect on early silicon */
 			LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 384k flash");
 			flash_size_in_kb = 384;
 		}

-----------------------------------------------------------------------

Summary of changes:
 src/flash/nor/stm32f1x.c |    6 +++---
 src/flash/nor/stm32f2x.c |    4 ++--
 src/flash/nor/stm32lx.c  |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository