diff options
| author | Erhan Kurubas <erhan.kurubas@espressif.com> | 2022-05-26 22:43:41 +0200 |
|---|---|---|
| committer | Antonio Borneo <borneo.antonio@gmail.com> | 2022-08-15 13:19:45 +0000 |
| commit | 9903203d73c9243c327db9dc0d726491bb625d41 (patch) | |
| tree | edc42c02141b71f3f400b72c361c9aedea2edf75 | |
| parent | 6d6207a8d3970beac73840a184af79d8dbeb1fbf (diff) | |
| download | riscv-openocd-9903203d73c9243c327db9dc0d726491bb625d41.zip riscv-openocd-9903203d73c9243c327db9dc0d726491bb625d41.tar.gz riscv-openocd-9903203d73c9243c327db9dc0d726491bb625d41.tar.bz2 | |
adapter: run at default speed when clock speed not specified
Signed-off-by: Erhan Kurubas <erhan.kurubas@espressif.com>
Change-Id: I8d2db4a1f618790907265a45d28a212551800b6c
Reviewed-on: https://review.openocd.org/c/openocd/+/7004
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
| -rw-r--r-- | src/jtag/adapter.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c index 14452d4..519505d 100644 --- a/src/jtag/adapter.c +++ b/src/jtag/adapter.c @@ -36,6 +36,8 @@ enum adapter_clk_mode { CLOCK_MODE_RCLK }; +#define DEFAULT_CLOCK_SPEED_KHZ 100U + /** * Adapter configuration */ @@ -70,6 +72,18 @@ int adapter_init(struct command_context *cmd_ctx) } int retval; + + if (adapter_config.clock_mode == CLOCK_MODE_UNSELECTED) { + LOG_WARNING("An adapter speed is not selected in the init scripts." + " OpenOCD will try to run the adapter at the low speed (%d kHz)", + DEFAULT_CLOCK_SPEED_KHZ); + LOG_WARNING("To remove this warnings and achieve reasonable communication speed with the target," + " set \"adapter speed\" or \"jtag_rclk\" in the init scripts."); + retval = adapter_config_khz(DEFAULT_CLOCK_SPEED_KHZ); + if (retval != ERROR_OK) + return ERROR_JTAG_INIT_FAILED; + } + retval = adapter_driver->init(); if (retval != ERROR_OK) return retval; @@ -80,12 +94,6 @@ int adapter_init(struct command_context *cmd_ctx) return ERROR_OK; } - if (adapter_config.clock_mode == CLOCK_MODE_UNSELECTED) { - LOG_ERROR("An adapter speed is not selected in the init script." - " Insert a call to \"adapter speed\" or \"jtag_rclk\" to proceed."); - return ERROR_JTAG_INIT_FAILED; - } - int requested_khz = adapter_get_speed_khz(); int actual_khz = requested_khz; int speed_var = 0; |