From 7eca86c5a1641c12f706edd17563f30efc7e6809 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 13 Mar 2019 10:48:15 +0000 Subject: [PATCH] defs.mk, mcu-defs.mk: Search for openocd config in search path Add variables around MCU_OPENOCD_CFG_SEARCH_PATH and go search config there Signed-off-by: Jan Lindemann --- make/defs.mk | 1 + make/mcu-defs.mk | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/make/defs.mk b/make/defs.mk index 0002e2ba..bb8f67ec 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -116,6 +116,7 @@ install_local_cfg = $(INSTALL) -p -o $(CFGOWNER) -g $(CFGGROUP) -m $( cvs_files = sh $(MOD_SCRIPT_DIR)/scm.sh ls-files -f add_flavour_prefix = $(SED) "s/\([^ ][^ ]*\) *\([<>=]*\) *\([^ ]*\)/$(FLAVOUR_PREFIX)\1 \2 \3/g" beautify_lib_path = $(SED) 's/:/\n + /g' +find_file = $(firstword $(wildcard $(addsuffix /$(1),$(patsubst :, ,$(2)))) $(1)-not-found) ifeq ($(INCLUDE_REV_IN_VERSIONS),true) version = $(shell $(CAT) $1/VERSION | $(SED) 's/-dev//; s/[ ]*//g') diff --git a/make/mcu-defs.mk b/make/mcu-defs.mk index 3c11fbce..5eb4d4bd 100644 --- a/make/mcu-defs.mk +++ b/make/mcu-defs.mk @@ -26,7 +26,10 @@ MCU_BOARD_MODEL_LC ?= $(shell echo $(MCU_BOARD_MODEL) | tr '[A-Z]' '[a- MCU_BOARD ?= $(MCU_BOARD_MODEL) MCU_BOARD_LC ?= $(shell echo $(MCU_BOARD) | tr '[A-Z]' '[a-z]') -MCU_OPENOCD_CFG_FILE ?= $(TOPDIR)/make/openocd-$(MCU_BOARD_LC).cfg +MCU_OPENOCD_CFG_NAME ?= openocd-$(MCU_BOARD_LC).cfg +MCU_OPENOCD_CFG_DEFAULT_SEARCH_PATH ?= $(TOPDIR)/make +MCU_OPENOCD_CFG_SEARCH_PATH ?= $(MCU_OPENOCD_CFG_DEFAULT_SEARCH_PATH) +MCU_OPENOCD_CFG_FILE ?= $(call find_file,$(MCU_OPENOCD_CFG_NAME),$(MCU_OPENOCD_CFG_SEARCH_PATH)) MCU_OPENOCD_OPTS ?= -f $(MCU_OPENOCD_CFG_FILE) -c "echo \"Started by jw-build\"" -c "gdb_port 3333" -c "telnet_port 4444" -c "tcl_port 6666" MCU_OPENOCD_BIN ?= openocd MCU_OPENOCD ?= $(MCU_OPENOCD_BIN) $(MCU_OPENOCD_OPTS)