diff --git a/tcl/board/st_nucleo_f0.cfg b/tcl/board/st_nucleo_f0.cfg
index 4d8071127..975ea34a9 100644
--- a/tcl/board/st_nucleo_f0.cfg
+++ b/tcl/board/st_nucleo_f0.cfg
@@ -10,8 +10,6 @@
 
 source [find interface/stlink.cfg]
 
-transport select swd
-
 source [find target/stm32f0x.cfg]
 
 reset_config srst_only
diff --git a/tcl/board/stm320518_eval_stlink.cfg b/tcl/board/stm320518_eval_stlink.cfg
index 8f4652eff..d97ecaa11 100644
--- a/tcl/board/stm320518_eval_stlink.cfg
+++ b/tcl/board/stm320518_eval_stlink.cfg
@@ -8,8 +8,6 @@
 
 source [find interface/stlink.cfg]
 
-transport select swd
-
 # increase working area to 8KB
 set WORKAREASIZE 0x2000
 
diff --git a/tcl/board/stm32f0discovery.cfg b/tcl/board/stm32f0discovery.cfg
index 9a8e92153..e58ab156e 100644
--- a/tcl/board/stm32f0discovery.cfg
+++ b/tcl/board/stm32f0discovery.cfg
@@ -5,8 +5,6 @@
 
 source [find interface/stlink.cfg]
 
-transport select swd
-
 set WORKAREASIZE 0x2000
 source [find target/stm32f0x.cfg]
 
diff --git a/tcl/target/stm32f0x.cfg b/tcl/target/stm32f0x.cfg
index 5b8954eb2..06c8fa559 100644
--- a/tcl/target/stm32f0x.cfg
+++ b/tcl/target/stm32f0x.cfg
@@ -5,7 +5,8 @@
 #
 # stm32 devices support SWD transports only.
 #
-source [find target/swj-dp.tcl]
+transport select swd
+
 source [find mem_helper.tcl]
 
 if { [info exists CHIPNAME] } {
@@ -41,7 +42,7 @@ if { [info exists CPUTAPID] } {
    set _CPUTAPID 0x0bb11477
 }
 
-swj_newdap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
+swd newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
 dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
 
 set _TARGETNAME $_CHIPNAME.cpu