You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/07/30 05:10:39 UTC
[incubator-nuttx] 01/02: tools/Config.mk: Remove CONFIG_ARCH_BOARD
from BOARD_DIR when using a custom board.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 708daf2c3dc2f45ac0939dcbe3d32667af8fcca2
Author: Ouss4 <ab...@gmail.com>
AuthorDate: Wed Jul 29 15:42:15 2020 +0100
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 088be64..2b43c26 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)