[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-510-g766d6114f

[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  766d6114fea0c2748ed281db866588f975d2ba83 (commit)
       via  e48690cb26e4ab3499623c70feae7ad7c54b94bd (commit)
      from  f8367dbb4976474ac0a99f20b8028a1721f0c82e (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 766d6114fea0c2748ed281db866588f975d2ba83
Author: Antonio Borneo <bor...@gm...>
Date:   Wed Jul 25 09:47:16 2018 +0200

    target/cortex_a: allow command dacrfixup during init phase
    
    There is no reason to restrict the command "cortex_a dacrfixup"
    to the EXEC phase only.
    Change the command mode to ANY so the command can be used in
    the initialization phase too.
    
    Change-Id: I498cc6b2dbdc48b3b2dd5f0445519a51857b295f
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/4623
    Tested-by: jenkins
    Reviewed-by: Matthias Welwarsky <mat...@we...>

diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c
index e4d8331b2..4aae5e473 100644
--- a/src/target/cortex_a.c
+++ b/src/target/cortex_a.c
@@ -3438,7 +3438,7 @@ static const struct command_registration cortex_a_exec_command_handlers[] = {
 	{
 		.name = "dacrfixup",
 		.handler = handle_cortex_a_dacrfixup_command,
-		.mode = COMMAND_EXEC,
+		.mode = COMMAND_ANY,
 		.help = "set domain access control (DACR) to all-manager "
 			"on memory access",
 		.usage = "['on'|'off']",

commit e48690cb26e4ab3499623c70feae7ad7c54b94bd
Author: Antonio Borneo <bor...@gm...>
Date:   Wed Jul 25 10:24:49 2018 +0200

    target/arm_adi_v5: allow commands apsel and apcsw during init phase
    
    The current implementation of apsel cannot be executed during the
    initialization phase because it queries the DAP AP to retrieve and
    print the content of IDR register, and the query is only possible
    later on during the exec phase.
    But IDR information is already printed by the dedicated command
    apid, making redundant printing it by apsel too.
    Being unable to run apsel during initialization, makes also apcsw
    command (that depends on apsel) not usable in such phase.
    
    Modify the command apsel to only set the current AP, without making
    any transfer to the (possibly not initialized yet) DAP. When run
    without parameters, just print the current AP number.
    Change mode to COMMAND_ANY to apsel and to apcsw.
    
    Change-Id: Ibea6d531e435d1d49d782de1ed8ee6846e91bfdf
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/4624
    Tested-by: jenkins
    Reviewed-by: Matthias Welwarsky <mat...@we...>
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index dc5c80393..302ea7891 100644
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -1616,13 +1616,12 @@ COMMAND_HANDLER(dap_memaccess_command)
 COMMAND_HANDLER(dap_apsel_command)
 {
 	struct adiv5_dap *dap = adiv5_get_dap(CMD_DATA);
-	uint32_t apsel, apid;
-	int retval;
+	uint32_t apsel;
 
 	switch (CMD_ARGC) {
 	case 0:
-		apsel = dap->apsel;
-		break;
+		command_print(CMD_CTX, "%" PRIi32, dap->apsel);
+		return ERROR_OK;
 	case 1:
 		COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], apsel);
 		/* AP address is in bits 31:24 of DP_SELECT */
@@ -1634,18 +1633,7 @@ COMMAND_HANDLER(dap_apsel_command)
 	}
 
 	dap->apsel = apsel;
-
-	retval = dap_queue_ap_read(dap_ap(dap, apsel), AP_REG_IDR, &apid);
-	if (retval != ERROR_OK)
-		return retval;
-	retval = dap_run(dap);
-	if (retval != ERROR_OK)
-		return retval;
-
-	command_print(CMD_CTX, "ap %" PRIi32 " selected, identification register 0x%8.8" PRIx32,
-			apsel, apid);
-
-	return retval;
+	return ERROR_OK;
 }
 
 COMMAND_HANDLER(dap_apcsw_command)
@@ -1838,7 +1826,7 @@ const struct command_registration dap_instance_commands[] = {
 	{
 		.name = "apsel",
 		.handler = dap_apsel_command,
-		.mode = COMMAND_EXEC,
+		.mode = COMMAND_ANY,
 		.help = "Set the currently selected AP (default 0) "
 			"and display the result",
 		.usage = "[ap_num]",
@@ -1846,7 +1834,7 @@ const struct command_registration dap_instance_commands[] = {
 	{
 		.name = "apcsw",
 		.handler = dap_apcsw_command,
-		.mode = COMMAND_EXEC,
+		.mode = COMMAND_ANY,
 		.help = "Set CSW default bits",
 		.usage = "[value [mask]]",
 	},

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

Summary of changes:
 src/target/arm_adi_v5.c | 24 ++++++------------------
 src/target/cortex_a.c   |  2 +-
 2 files changed, 7 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository