From 708daf2c3dc2f45ac0939dcbe3d32667af8fcca2 Mon Sep 17 00:00:00 2001 From: Ouss4 Date: Wed, 29 Jul 2020 15:42:15 +0100 Subject: [PATCH] tools/Config.mk: Remove CONFIG_ARCH_BOARD from BOARD_DIR when using a custom board. Custom boards don't set CONFIG_ARCH_BOARD since the full path is given during configuration. Furthermore this creates problems when when referencing other folders using BOARD_DIR because a trailing DELIM will be present. --- tools/Config.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Config.mk b/tools/Config.mk index 088be647c3d..2b43c26eb22 100644 --- a/tools/Config.mk +++ b/tools/Config.mk @@ -139,9 +139,9 @@ endif ifeq ($(CONFIG_ARCH_BOARD_CUSTOM),y) ifeq ($(CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH),y) - BOARD_DIR ?= $(TOPDIR)$(DELIM)$(CONFIG_ARCH_BOARD_CUSTOM_DIR)$(DELIM)$(CONFIG_ARCH_BOARD) + BOARD_DIR ?= $(TOPDIR)$(DELIM)$(CONFIG_ARCH_BOARD_CUSTOM_DIR) else - BOARD_DIR ?= $(CONFIG_ARCH_BOARD_CUSTOM_DIR)$(DELIM)$(CONFIG_ARCH_BOARD) + BOARD_DIR ?= $(CONFIG_ARCH_BOARD_CUSTOM_DIR) endif else BOARD_DIR ?= $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)