stlink: remove 18 MHz jtag freq for stlink v2

[fw/openocd] / src / jtag / drivers / stlink_usb.c

diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
index 6ab979f1c44a8bc37d6453e66132e65df7295e6a..3f9ce37a9d1e06c2c3d5b3f79114addac3ec3978 100644 (file)
--- a/src/jtag/drivers/stlink_usb.c
+++ b/src/jtag/drivers/stlink_usb.c
@@ -347,7 +347,6 @@ static const struct speed_map stlink_khz_to_speed_map_swd[] = {
 
 /* JTAG clock speed */
 static const struct speed_map stlink_khz_to_speed_map_jtag[] = {
-       {18000, 2},
        {9000,  4},
        {4500,  8},
        {2250, 16},
@@ -3705,7 +3704,12 @@ static int stlink_dap_speed(int speed)
 /** */
 static int stlink_dap_khz(int khz, int *jtag_speed)
 {
-       *jtag_speed = khz;
+       if (khz == 0) {
+               LOG_ERROR("RCLK not supported");
+               return ERROR_FAIL;
+       }
+
+       *jtag_speed = stlink_speed(stlink_dap_handle, khz, true);
        return ERROR_OK;
 }