diff --git a/boards/common/cc26x2_cc13x2/Makefile.include b/boards/common/cc26x2_cc13x2/Makefile.include
index 24744dc673..8877f48141 100644
--- a/boards/common/cc26x2_cc13x2/Makefile.include
+++ b/boards/common/cc26x2_cc13x2/Makefile.include
@@ -2,6 +2,7 @@
 PROGRAMMER ?= uniflash
 
 OPENOCD_CONFIG ?= $(RIOTBOARD)/common/cc26x2_cc13x2/dist/openocd.cfg
+UNIFLASH_CONFIG ?= $(RIOTBOARD)/common/cc26x2_cc13x2/dist
 
 ifeq ($(PROGRAMMER),uniflash)
   include $(RIOTMAKE)/tools/uniflash.inc.mk
diff --git a/boards/cc1312-launchpad/dist/cc1312r1f3_XDS110.ccxml b/boards/common/cc26x2_cc13x2/dist/cc1312r1f3_XDS110.ccxml
similarity index 100%
rename from boards/cc1312-launchpad/dist/cc1312r1f3_XDS110.ccxml
rename to boards/common/cc26x2_cc13x2/dist/cc1312r1f3_XDS110.ccxml
diff --git a/boards/cc1312-launchpad/dist/cc1312r1f3_XDS110.dat b/boards/common/cc26x2_cc13x2/dist/cc1312r1f3_XDS110.dat
similarity index 100%
rename from boards/cc1312-launchpad/dist/cc1312r1f3_XDS110.dat
rename to boards/common/cc26x2_cc13x2/dist/cc1312r1f3_XDS110.dat
diff --git a/boards/cc1312-launchpad/dist/cc1312r1f3_gdb.conf b/boards/common/cc26x2_cc13x2/dist/cc1312r1f3_gdb.conf
similarity index 100%
rename from boards/cc1312-launchpad/dist/cc1312r1f3_gdb.conf
rename to boards/common/cc26x2_cc13x2/dist/cc1312r1f3_gdb.conf
diff --git a/boards/cc1352p-launchpad/dist/cc1352p1_XDS110.ccxml b/boards/common/cc26x2_cc13x2/dist/cc1352p1_XDS110.ccxml
similarity index 100%
rename from boards/cc1352p-launchpad/dist/cc1352p1_XDS110.ccxml
rename to boards/common/cc26x2_cc13x2/dist/cc1352p1_XDS110.ccxml
diff --git a/boards/cc1352p-launchpad/dist/cc1352p1_XDS110.dat b/boards/common/cc26x2_cc13x2/dist/cc1352p1_XDS110.dat
similarity index 100%
rename from boards/cc1352p-launchpad/dist/cc1352p1_XDS110.dat
rename to boards/common/cc26x2_cc13x2/dist/cc1352p1_XDS110.dat
diff --git a/boards/cc1352p-launchpad/dist/cc1352p1_gdb.conf b/boards/common/cc26x2_cc13x2/dist/cc1352p1_gdb.conf
similarity index 100%
rename from boards/cc1352p-launchpad/dist/cc1352p1_gdb.conf
rename to boards/common/cc26x2_cc13x2/dist/cc1352p1_gdb.conf
diff --git a/boards/cc1352-launchpad/dist/cc1352r1_XDS110.ccxml b/boards/common/cc26x2_cc13x2/dist/cc1352r1_XDS110.ccxml
similarity index 100%
rename from boards/cc1352-launchpad/dist/cc1352r1_XDS110.ccxml
rename to boards/common/cc26x2_cc13x2/dist/cc1352r1_XDS110.ccxml
diff --git a/boards/cc1352-launchpad/dist/cc1352r1_XDS110.dat b/boards/common/cc26x2_cc13x2/dist/cc1352r1_XDS110.dat
similarity index 100%
rename from boards/cc1352-launchpad/dist/cc1352r1_XDS110.dat
rename to boards/common/cc26x2_cc13x2/dist/cc1352r1_XDS110.dat
diff --git a/boards/cc1352-launchpad/dist/cc1352r1_gdb.conf b/boards/common/cc26x2_cc13x2/dist/cc1352r1_gdb.conf
similarity index 100%
rename from boards/cc1352-launchpad/dist/cc1352r1_gdb.conf
rename to boards/common/cc26x2_cc13x2/dist/cc1352r1_gdb.conf
diff --git a/makefiles/tools/uniflash.inc.mk b/makefiles/tools/uniflash.inc.mk
index 4162e58a7f..5845044063 100644
--- a/makefiles/tools/uniflash.inc.mk
+++ b/makefiles/tools/uniflash.inc.mk
@@ -1,9 +1,11 @@
 # http://www.ti.com/tool/uniflash
 FLASHFILE ?= $(ELFFILE)
 
-UNIFLASH_CONFIG_CCXML ?= $(BOARDDIR)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml
-UNIFLASH_CONFIG_DAT ?= $(BOARDDIR)/dist/$(CPU_MODEL)_$(XDEBUGGER).dat
-UNIFLASH_CONFIG_GDB ?= $(BOARDDIR)/dist/$(CPU_MODEL)_gdb.conf
+UNIFLASH_CONFIG ?= $(BOARDDIR)/dist
+
+UNIFLASH_CONFIG_CCXML ?= $(UNIFLASH_CONFIG)/$(CPU_MODEL)_$(XDEBUGGER).ccxml
+UNIFLASH_CONFIG_DAT ?= $(UNIFLASH_CONFIG)/$(CPU_MODEL)_$(XDEBUGGER).dat
+UNIFLASH_CONFIG_GDB ?= $(UNIFLASH_CONFIG)/$(CPU_MODEL)_gdb.conf
 
 UNIFLASH_PATH ?= "UNIFLASH_PATH unconfigured"
 # check which uniflash version is available, either 4.x or 3.x