From 9fbb23b1673c0a9f60b84a9de9334854f4aa22c8 Mon Sep 17 00:00:00 2001 From: Marian Buschsieweke Date: Fri, 19 Jan 2024 23:15:08 +0100 Subject: [PATCH] boards/common/gd32v: make common OpenOCD config opt-in Let boards explicitly use the common OpenOCD config if it works for them, rather than having boards with specific needs opt out. --- boards/common/gd32v/Makefile.include | 1 - boards/seeedstudio-gd32/Makefile.include | 1 + boards/sipeed-longan-nano/Makefile.include | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/boards/common/gd32v/Makefile.include b/boards/common/gd32v/Makefile.include index 75433dd97c..b5dd169bfa 100644 --- a/boards/common/gd32v/Makefile.include +++ b/boards/common/gd32v/Makefile.include @@ -7,7 +7,6 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # configure the flasher PROGRAMMER ?= openocd -OPENOCD_CONFIG ?= $(RIOTBOARD)/common/gd32v/dist/openocd.cfg OPENOCD_DEBUG_ADAPTER ?= ftdi OPENOCD_FTDI_ADAPTER ?= openocd-usb OPENOCD_TRANSPORT ?= jtag diff --git a/boards/seeedstudio-gd32/Makefile.include b/boards/seeedstudio-gd32/Makefile.include index 3f5d298382..bb961d1670 100644 --- a/boards/seeedstudio-gd32/Makefile.include +++ b/boards/seeedstudio-gd32/Makefile.include @@ -1,2 +1,3 @@ PORT_LINUX ?= /dev/ttyACM0 +OPENOCD_CONFIG ?= $(RIOTBOARD)/common/gd32v/dist/openocd.cfg include $(RIOTBOARD)/common/gd32v/Makefile.include diff --git a/boards/sipeed-longan-nano/Makefile.include b/boards/sipeed-longan-nano/Makefile.include index 1ff81aea98..eb14ed5d14 100644 --- a/boards/sipeed-longan-nano/Makefile.include +++ b/boards/sipeed-longan-nano/Makefile.include @@ -1,4 +1,5 @@ PORT_LINUX ?= /dev/ttyACM0 PROGRAMMER ?= dfu-util +OPENOCD_CONFIG ?= $(RIOTBOARD)/common/gd32v/dist/openocd.cfg include $(RIOTBOARD)/common/gd32v/Makefile.include