waftools: openocd: fix cmsis-dap

Align naming with others swd_*, and fix it by selecting transport.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>

waftools/openocd.py

@@ -31,7 +31,7 @@ JTAG_OPTIONS = {'olimex': 'source [find interface/ftdi/olimex-arm-usb-ocd-h.cfg]
                 'swd_ftdi': 'source waftools/openocd_swd_ftdi.cfg',
                 'swd_jlink': 'source waftools/openocd_swd_jlink.cfg',
                 'swd_stlink': 'source [find interface/stlink-v2.cfg]',
-                'cmsis-dap': 'source [find interface/cmsis-dap.cfg]',
+                'swd_cmsisdap': 'source waftools/openocd_swd_cmsisdap.cfg',
                 }
 
 OPENOCD_TELNET_PORT = 4444

waftools/openocd_swd_cmsisdap.cfg

@@ -0,0 +1,2 @@
+source [find interface/cmsis-dap.cfg]
+transport select swd

wscript

@@ -424,7 +424,7 @@ def configure(conf):
                                 'silk_evt', 'silk_bb', 'silk_bb2', 'silk'):
         conf.env.JTAG = 'swd_ftdi'
     elif conf.options.board in ('asterix_evt1'):
-        conf.env.JTAG = 'cmsis-dap'
+        conf.env.JTAG = 'swd_cmsisdap'
     else:
         # default to bb2
         conf.env.JTAG = 'bb2'