[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.8.0-92-g287d6e0

[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  287d6e033a4d6777801525e27ca8ad387cfe7ec2 (commit)
      from  59c2239bfd2db3d3a6f3f3756f79e47a0aa6591d (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 287d6e033a4d6777801525e27ca8ad387cfe7ec2
Author: Nemui Trinomius <nem...@li...>
Date:   Wed Jul 2 07:18:16 2014 +0900

    kinetis : Added Kinetis-K Series MDM-AP ID.
    
    Kinetis-K series has ID:0x001C0000 on MDM-AP IDR register.
    Other Kinetis(L/M/V/E) series have ID:0x001C0020.
    
    Change-Id: Iada37038cd239f7331ba80a3673b36bf7e18c555
    Signed-off-by: Nemui Trinomius <nem...@li...>
    Reviewed-on: http://openocd.zylin.com/2195
    Tested-by: jenkins
    Reviewed-by: Andreas Fritiofson <and...@gm...>

diff --git a/src/flash/nor/kinetis.c b/src/flash/nor/kinetis.c
index 6f47461..e8917c7 100644
--- a/src/flash/nor/kinetis.c
+++ b/src/flash/nor/kinetis.c
@@ -369,7 +369,8 @@ COMMAND_HANDLER(kinetis_mdm_mass_erase)
 }
 
 static const uint32_t kinetis_known_mdm_ids[] = {
-	0x001C0020,	/* KL26Z */
+	0x001C0000,	/* Kinetis-K Series */
+	0x001C0020,	/* Kinetis-L/M/V/E Series */
 };
 
 /*

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

Summary of changes:
 src/flash/nor/kinetis.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository