[OpenOCD-commit] branch, master, updated. v0.7.0-12-g2aada5b

[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 "".

The branch, master has been updated
       via  2aada5b8d9869ebc69984223710253ba905d61cd (commit)
      from  70a2ffac8e2db994e691065259422fa6886ee67f (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 2aada5b8d9869ebc69984223710253ba905d61cd
Author: Paul Fertser <fer...@gm...>
Date:   Thu May 23 15:20:45 2013 +0400

    targets: fix target_type name for Cortex-A targets
    
    Commit d9ba56c295f057e716519a798bf9cdb4898c24f4 did a bunch of
    renaming of cortex_a8 to cortex_a, including the names in config
    files. However that introduced a regression as the name in target_type
    struct remained unchanged.
    
    This adds the last missing bit: actual renaming of the target name as
    understood by OpenOCD.
    
    Also change the (hopefully) last instance of using it in the supplied
    config files, namely from imx6.cfg.
    
    Change-Id: Ib9289fc6d946630133ec6e36c20015ccb50acf61
    Signed-off-by: Paul Fertser <fer...@gm...>
    Reviewed-on: http://openocd.zylin.com/1420
    Tested-by: jenkins
    Reviewed-by: Chris Johns <ch...@rt...>
    Reviewed-by: Spencer Oliver <sp...@sp...>

diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c
index 2b5510f..7788ada 100644
--- a/src/target/cortex_a.c
+++ b/src/target/cortex_a.c
@@ -2756,7 +2756,8 @@ static const struct command_registration cortex_a8_command_handlers[] = {
 };
 
 struct target_type cortexa8_target = {
-	.name = "cortex_a8",
+	.name = "cortex_a",
+	.deprecated_name = "cortex_a8",
 
 	.poll = cortex_a8_poll,
 	.arch_state = armv7a_arch_state,
diff --git a/tcl/target/imx6.cfg b/tcl/target/imx6.cfg
index 707bab8..292b114 100644
--- a/tcl/target/imx6.cfg
+++ b/tcl/target/imx6.cfg
@@ -37,7 +37,7 @@ jtag newtap $_CHIPNAME sjc -irlen 5 -ircapture 0x01 -irmask 0x1f \
 # core 2  -  0x82154000
 # core 3  -  0x82156000
 set _TARGETNAME $_CHIPNAME.cpu.0
-target create $_TARGETNAME cortex_a8 -chain-position $_CHIPNAME.dap \
+target create $_TARGETNAME cortex_a -chain-position $_CHIPNAME.dap \
         -coreid 0 -dbgbase 0x82150000
 
 # some TCK cycles are required to activate the DEBUG power domain
@@ -45,7 +45,7 @@ jtag configure $_CHIPNAME.sjc -event post-reset "runtest 100"
 
 proc imx6_dbginit {target} {
         # General Cortex A8/A9 debug initialisation
-        cortex_a8 dbginit
+        cortex_a dbginit
 }
 
 # Slow speed to be sure it will work

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

Summary of changes:
 src/target/cortex_a.c |    3 ++-
 tcl/target/imx6.cfg   |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
--