diff --git a/boards/cc1350-launchpad/Makefile.include b/boards/cc1350-launchpad/Makefile.include
index bb150c86dc..6453ba1dd5 100644
--- a/boards/cc1350-launchpad/Makefile.include
+++ b/boards/cc1350-launchpad/Makefile.include
@@ -1,4 +1,6 @@
XDEBUGGER = XDS110
+OPENOCD_CONFIG ?= $(BOARDDIR)/dist/openocd.cfg
+
# configure the flash tool
-PROGRAMMER ?= uniflash
+include $(RIOTBOARD)/common/cc26xx_cc13xx/Makefile.include
diff --git a/boards/cc2650-launchpad/Makefile.include b/boards/cc2650-launchpad/Makefile.include
index bb150c86dc..6453ba1dd5 100644
--- a/boards/cc2650-launchpad/Makefile.include
+++ b/boards/cc2650-launchpad/Makefile.include
@@ -1,4 +1,6 @@
XDEBUGGER = XDS110
+OPENOCD_CONFIG ?= $(BOARDDIR)/dist/openocd.cfg
+
# configure the flash tool
-PROGRAMMER ?= uniflash
+include $(RIOTBOARD)/common/cc26xx_cc13xx/Makefile.include
diff --git a/boards/cc2650stk/Makefile.include b/boards/cc2650stk/Makefile.include
index bb150c86dc..6453ba1dd5 100644
--- a/boards/cc2650stk/Makefile.include
+++ b/boards/cc2650stk/Makefile.include
@@ -1,4 +1,6 @@
XDEBUGGER = XDS110
+OPENOCD_CONFIG ?= $(BOARDDIR)/dist/openocd.cfg
+
# configure the flash tool
-PROGRAMMER ?= uniflash
+include $(RIOTBOARD)/common/cc26xx_cc13xx/Makefile.include
diff --git a/boards/cc2650stk/dist/cc26x0f128_XDS100v3.ccxml b/boards/cc2650stk/dist/cc26x0f128_XDS100v3.ccxml
deleted file mode 100644
index c44e547999..0000000000
--- a/boards/cc2650stk/dist/cc26x0f128_XDS100v3.ccxml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/boards/cc2650stk/dist/cc26x0f128_XDS100v3.dat b/boards/cc2650stk/dist/cc26x0f128_XDS100v3.dat
deleted file mode 100644
index 9285857cb2..0000000000
--- a/boards/cc2650stk/dist/cc26x0f128_XDS100v3.dat
+++ /dev/null
@@ -1,68 +0,0 @@
-# config version=3.5
-$ sepk
- pod_drvr=libjioserdesusbv3.so
- pod_port=0
-$ /
-$ product
- title="Texas Instruments XDS100v3 USB"
- alias=TI_XDS100v3_USB
- name=FTDI_FT2232
-$ /
-$ ftdi_ft2232
- usb_vid=0x0403
- usb_pid=0xa6d1
- gpio_l0="TRSTn,Active_Low"
- gpio_l1="EMU_Pin_Enable,Active_Low"
- gpio_l2="EMU_Pin_0,Active_Low"
- gpio_l3="Adaptive_Clock,Active_High"
- gpio_h0="SRSTn,Active_High"
- gpio_h1="Clock_Fail_Detect,Active_High"
- gpio_h2="Power_Loss_Detect,Active_Low"
- gpio_h3="Power_Loss_Reset,Active_High"
- gpio_h4="EMU_Pin_1,Active_Low"
- gpio_h5="Cable_Disconnect,Active_High"
- gpio_h6="Dot7_Bypass,Active_Low"
- gpio_h7="Alternate_Io,Active_Low"
- apio_l0=Unused
- apio_l1="Jtag_Isolate,Active_High"
- apio_l2="Clock_Fail_Enable,Active_High"
- apio_l3=Unused
- apio_h0=Unused
- apio_h1="Status_0,Active_High"
- apio_h2="Status_2,Active_High"
- apio_h3=Unused
- apio_h4="Jtag_Loopback,Active_High"
- apio_h5="Status_1,Active_High"
- apio_h6=Unused
- apio_h7=Unused
-$ /
-$ uscif
- tdoedge=FALL
- jtagboot_mode=disable
- jtagboot_value=hiz
- powerboot_mode=disable
- powerboot_value=hiz
- jtag_isolate=disable
-$ /
-$ dot7
- dts_usage=enable
- dts_type=xds100v3
- ts_pin_width=all_four
-$ /
-$ uscif
- tclk_program=adaptive
- tclk_frequency=3.0
-$ /
-$ dot7
- dts_program=emulator
- dts_frequency=16.7MHz
- ts_format=jscan0
-$ /
-@ icepick_c family=icepick_c irbits=6 drbits=1 subpaths=1
- & subpath_0 address=16 default=no custom=yes force=yes pseudo=no
- @ cs_dap_0 family=cs_dap irbits=4 drbits=1 subpaths=1 identify=0x4BA00477
- & subpath_1 type=debug address=0 default=no custom=yes force=yes pseudo=no
- @ cortex_m3_0 family=cortex_mxx irbits=0 drbits=0 identify=0x02000000 traceid=0x0
- & /
- & /
-# /
diff --git a/boards/cc2650stk/dist/cc26x0f128_XDS110.ccxml b/boards/cc2650stk/dist/cc26x0f128_XDS110.ccxml
deleted file mode 100644
index 210180b8b2..0000000000
--- a/boards/cc2650stk/dist/cc26x0f128_XDS110.ccxml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/boards/cc2650stk/dist/cc26x0f128_XDS110.dat b/boards/cc2650stk/dist/cc26x0f128_XDS110.dat
deleted file mode 100644
index 62375c31ad..0000000000
--- a/boards/cc2650stk/dist/cc26x0f128_XDS110.dat
+++ /dev/null
@@ -1,31 +0,0 @@
-# config version=3.5
-$ sepk
- pod_drvr=libjioxds110.so
- pod_port=0
-$ /
-$ product
- title="Texas Instruments XDS110 USB"
- alias=TI_XDS110_USB
- name=XDS110
-$ /
-$ uscif
- tdoedge=FALL
- tclk_program=DEFAULT
- tclk_frequency=2.5MHz
- jtag_isolate=enable
-$ /
-$ dot7
- dts_usage=nothing
-$ /
-$ swd
- swd_debug=disabled
- swo_data=aux_uart
-$ /
-@ icepick_c family=icepick_c irbits=6 drbits=1 subpaths=1
- & subpath_0 address=16 default=no custom=yes force=yes pseudo=no
- @ cs_dap_0 family=cs_dap irbits=4 drbits=1 subpaths=1 identify=0x4BA00477
- & subpath_1 type=debug address=0 default=no custom=yes force=yes pseudo=no
- @ cortex_m3_0 family=cortex_mxx irbits=0 drbits=0 identify=0x02000000 traceid=0x0
- & /
- & /
-# /
diff --git a/boards/cc2650stk/dist/cc26x0f128_gdb.conf b/boards/cc2650stk/dist/cc26x0f128_gdb.conf
deleted file mode 100644
index 7fc681f266..0000000000
--- a/boards/cc2650stk/dist/cc26x0f128_gdb.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-mem 0x00 0x20000 ro 32 nocache
-mem 0x10000000 0x10020000 ro 32 nocache
-mem 0x20000000 0x20005000 rw 32 nocache
-mem 0x40000000 0x400E1028 rw 32 nocache
-mem 0xE000E000 0xE000F000 rw 32 nocache
-target remote localhost:3333
diff --git a/boards/cc1350-launchpad/dist/cc13x0f128_XDS110.ccxml b/boards/common/cc26xx_cc13xx/dist/cc13x0f128_XDS110.ccxml
similarity index 100%
rename from boards/cc1350-launchpad/dist/cc13x0f128_XDS110.ccxml
rename to boards/common/cc26xx_cc13xx/dist/cc13x0f128_XDS110.ccxml
diff --git a/boards/cc1350-launchpad/dist/cc13x0f128_XDS110.dat b/boards/common/cc26xx_cc13xx/dist/cc13x0f128_XDS110.dat
similarity index 100%
rename from boards/cc1350-launchpad/dist/cc13x0f128_XDS110.dat
rename to boards/common/cc26xx_cc13xx/dist/cc13x0f128_XDS110.dat
diff --git a/boards/cc1350-launchpad/dist/cc13x0f128_gdb.conf b/boards/common/cc26xx_cc13xx/dist/cc13x0f128_gdb.conf
similarity index 100%
rename from boards/cc1350-launchpad/dist/cc13x0f128_gdb.conf
rename to boards/common/cc26xx_cc13xx/dist/cc13x0f128_gdb.conf
diff --git a/boards/cc2650-launchpad/dist/cc26x0f128_XDS100v3.ccxml b/boards/common/cc26xx_cc13xx/dist/cc26x0f128_XDS100v3.ccxml
similarity index 100%
rename from boards/cc2650-launchpad/dist/cc26x0f128_XDS100v3.ccxml
rename to boards/common/cc26xx_cc13xx/dist/cc26x0f128_XDS100v3.ccxml
diff --git a/boards/cc2650-launchpad/dist/cc26x0f128_XDS100v3.dat b/boards/common/cc26xx_cc13xx/dist/cc26x0f128_XDS100v3.dat
similarity index 100%
rename from boards/cc2650-launchpad/dist/cc26x0f128_XDS100v3.dat
rename to boards/common/cc26xx_cc13xx/dist/cc26x0f128_XDS100v3.dat
diff --git a/boards/cc2650-launchpad/dist/cc26x0f128_XDS110.ccxml b/boards/common/cc26xx_cc13xx/dist/cc26x0f128_XDS110.ccxml
similarity index 100%
rename from boards/cc2650-launchpad/dist/cc26x0f128_XDS110.ccxml
rename to boards/common/cc26xx_cc13xx/dist/cc26x0f128_XDS110.ccxml
diff --git a/boards/cc2650-launchpad/dist/cc26x0f128_XDS110.dat b/boards/common/cc26xx_cc13xx/dist/cc26x0f128_XDS110.dat
similarity index 100%
rename from boards/cc2650-launchpad/dist/cc26x0f128_XDS110.dat
rename to boards/common/cc26xx_cc13xx/dist/cc26x0f128_XDS110.dat
diff --git a/boards/cc2650-launchpad/dist/cc26x0f128_gdb.conf b/boards/common/cc26xx_cc13xx/dist/cc26x0f128_gdb.conf
similarity index 100%
rename from boards/cc2650-launchpad/dist/cc26x0f128_gdb.conf
rename to boards/common/cc26xx_cc13xx/dist/cc26x0f128_gdb.conf