riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14209 from btcven/2020_06_04-common-cfg

Browse Source 
boards/cc26x2_cc13x2-based: move config to common directory
This commit is contained in:
benpicco 2020-06-10 15:32:11 +02:00 committed by GitHub
commit 75d82cc9b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boards/common/cc26x2_cc13x2/Makefile.include
View File

@ -2,6 +2,7 @@
PROGRAMMER ?= uniflash PROGRAMMER ?= uniflash
OPENOCD_CONFIG ?= $(RIOTBOARD)/common/cc26x2_cc13x2/dist/openocd.cfg OPENOCD_CONFIG ?= $(RIOTBOARD)/common/cc26x2_cc13x2/dist/openocd.cfg
UNIFLASH_CONFIG ?= $(RIOTBOARD)/common/cc26x2_cc13x2/dist
ifeq ($(PROGRAMMER),uniflash) ifeq ($(PROGRAMMER),uniflash)
include $(RIOTMAKE)/tools/uniflash.inc.mk include $(RIOTMAKE)/tools/uniflash.inc.mk

0
boards/cc1312-launchpad/dist/cc1312r1f3_XDS110.ccxml → boards/common/cc26x2_cc13x2/dist/cc1312r1f3_XDS110.ccxml vendored
View File

0
boards/cc1312-launchpad/dist/cc1312r1f3_XDS110.dat → boards/common/cc26x2_cc13x2/dist/cc1312r1f3_XDS110.dat vendored
View File

0
boards/cc1312-launchpad/dist/cc1312r1f3_gdb.conf → boards/common/cc26x2_cc13x2/dist/cc1312r1f3_gdb.conf vendored
View File

0
boards/cc1352p-launchpad/dist/cc1352p1_XDS110.ccxml → boards/common/cc26x2_cc13x2/dist/cc1352p1_XDS110.ccxml vendored
View File

0
boards/cc1352p-launchpad/dist/cc1352p1_XDS110.dat → boards/common/cc26x2_cc13x2/dist/cc1352p1_XDS110.dat vendored
View File

0
boards/cc1352p-launchpad/dist/cc1352p1_gdb.conf → boards/common/cc26x2_cc13x2/dist/cc1352p1_gdb.conf vendored
View File

0
boards/cc1352-launchpad/dist/cc1352r1_XDS110.ccxml → boards/common/cc26x2_cc13x2/dist/cc1352r1_XDS110.ccxml vendored
View File

0
boards/cc1352-launchpad/dist/cc1352r1_XDS110.dat → boards/common/cc26x2_cc13x2/dist/cc1352r1_XDS110.dat vendored
View File

0
boards/cc1352-launchpad/dist/cc1352r1_gdb.conf → boards/common/cc26x2_cc13x2/dist/cc1352r1_gdb.conf vendored
View File

8
makefiles/tools/uniflash.inc.mk
View File

@ -1,9 +1,11 @@
# http://www.ti.com/tool/uniflash # http://www.ti.com/tool/uniflash
FLASHFILE ?= $(ELFFILE) FLASHFILE ?= $(ELFFILE)
UNIFLASH_CONFIG_CCXML ?= $(BOARDDIR)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml UNIFLASH_CONFIG ?= $(BOARDDIR)/dist
UNIFLASH_CONFIG_DAT ?= $(BOARDDIR)/dist/$(CPU_MODEL)_$(XDEBUGGER).dat
UNIFLASH_CONFIG_GDB ?= $(BOARDDIR)/dist/$(CPU_MODEL)_gdb.conf 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" UNIFLASH_PATH ?= "UNIFLASH_PATH unconfigured"
# check which uniflash version is available, either 4.x or 3.x # check which uniflash version is available, either 4.x or 3.x