3 files changed, 25 insertions, 0 deletions
diff --git a/src/jtag/drivers/ti_icdi_usb.c b/src/jtag/drivers/ti_icdi_usb.c
index 2f4af7a4..53abbfb4 100644
--- a/src/jtag/drivers/ti_icdi_usb.c
+++ b/src/jtag/drivers/ti_icdi_usb.c
@@ -777,4 +777,5 @@ struct hl_layout_api_s icdi_usb_layout_api = {
 	.write_mem = icdi_usb_write_mem,
 	.write_debug_reg = icdi_usb_write_debug_reg,
 	.override_target = icdi_usb_override_target,
+	.custom_command = icdi_send_remote_cmd,
 };
diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c
index 964b0744..ce914ea0 100644
--- a/src/jtag/hla/hla_interface.c
+++ b/src/jtag/hla/hla_interface.c
@@ -268,6 +268,21 @@ COMMAND_HANDLER(interface_handle_trace_command)
 	return ERROR_OK;
 }
 
+COMMAND_HANDLER(interface_handle_hla_command)
+{
+	if (CMD_ARGC != 1)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
+	if (!hl_if.layout->api->custom_command) {
+		LOG_ERROR("The selected adapter doesn't support custom commands");
+		return ERROR_FAIL;
+	}
+
+	hl_if.layout->api->custom_command(hl_if.handle, CMD_ARGV[0]);
+
+	return ERROR_OK;
+}
+
 static const struct command_registration hl_interface_command_handlers[] = {
 	{
 	 .name = "hla_device_desc",
@@ -304,6 +319,13 @@ static const struct command_registration hl_interface_command_handlers[] = {
 	 .help = "configure trace reception",
 	 .usage = "source_lock_hz [destination_path]",
 	 },
+	 {
+	 .name = "hla_command",
+	 .handler = &interface_handle_hla_command,
+	 .mode = COMMAND_EXEC,
+	 .help = "execute a custom adapter-specific command",
+	 .usage = "hla_command <command>",
+	 },
 	COMMAND_REGISTRATION_DONE
 };
 
diff --git a/src/jtag/hla/hla_layout.h b/src/jtag/hla/hla_layout.h
index 6d79d581..df93cb69 100644
--- a/src/jtag/hla/hla_layout.h
+++ b/src/jtag/hla/hla_layout.h
@@ -76,6 +76,8 @@ struct hl_layout_api_s {
 	/** */
 	int (*override_target) (const char *targetname);
 	/** */
+	int (*custom_command) (void *handle, const char *command);
+	/** */
 	enum target_state (*state) (void *fd);
 };