X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fhla_target.c;h=4f97eb95c58deffbd7ac41c45058e92a070a9cf1;hp=ba88248e3a81a117df1579a68e55581f352a3a1f;hb=96903e6df43e2bc967267e034edf15a7c274d044;hpb=6e76e56e2e34b78e4f0fad4238c2de85b1983305

diff --git a/src/target/hla_target.c b/src/target/hla_target.c
index ba88248e3a..4f97eb95c5 100644
--- a/src/target/hla_target.c
+++ b/src/target/hla_target.c
@@ -365,11 +365,17 @@ static int adapter_target_create(struct target *target,
 		Jim_Interp *interp)
 {
 	LOG_DEBUG("%s", __func__);
+	struct adiv5_private_config *pc = target->private_config;
+	if (pc != NULL && pc->ap_num > 0) {
+		LOG_ERROR("hla_target: invalid parameter -ap-num (> 0)");
+		return ERROR_COMMAND_SYNTAX_ERROR;
+	}
 
 	struct cortex_m_common *cortex_m = calloc(1, sizeof(struct cortex_m_common));
-
-	if (!cortex_m)
-		return ERROR_COMMAND_SYNTAX_ERROR;
+	if (cortex_m == NULL) {
+		LOG_ERROR("No memory creating target");
+		return ERROR_FAIL;
+	}
 
 	adapter_init_arch_info(target, cortex_m, target->tap);
 
@@ -466,6 +472,9 @@ static int adapter_poll(struct target *target)
 	if (prev_target_state == state)
 		return ERROR_OK;
 
+	if (prev_target_state == TARGET_DEBUG_RUNNING && state == TARGET_RUNNING)
+		return ERROR_OK;
+
 	target->state = state;
 
 	if (state == TARGET_HALTED) {
@@ -801,6 +810,7 @@ struct target_type hla_target = {
 	.init_target = adapter_init_target,
 	.deinit_target = cortex_m_deinit_target,
 	.target_create = adapter_target_create,
+	.target_jim_configure = adiv5_jim_configure,
 	.examine = cortex_m_examine,
 	.commands = adapter_command_handlers,
 
@@ -815,6 +825,7 @@ struct target_type hla_target = {
 	.resume = adapter_resume,
 	.step = adapter_step,
 
+	.get_gdb_arch = arm_get_gdb_arch,
 	.get_gdb_reg_list = armv7m_get_gdb_reg_list,
 
 	.read_memory = adapter_read_memory,