From e8213b9ae5cd1e8d1e121e35aaac731fb8d5aee8 Mon Sep 17 00:00:00 2001 From: Petro Karashchenko Date: Wed, 9 Mar 2022 18:15:09 +0100 Subject: [PATCH] tools: define BOARD_COMMON_DIR only if ARCH_BOARD_COMMON is set Signed-off-by: Petro Karashchenko --- tools/Config.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/Config.mk b/tools/Config.mk index dd693e57586..48aa2b3fb0b 100644 --- a/tools/Config.mk +++ b/tools/Config.mk @@ -150,9 +150,12 @@ else BOARD_KCONFIG = $(CUSTOM_BOARD_KPATH) endif -BOARD_COMMON_DIR ?= $(wildcard $(BOARD_DIR)$(DELIM)..$(DELIM)common) -ifeq ($(BOARD_COMMON_DIR),) - BOARD_COMMON_DIR = $(wildcard $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)common) +ifeq (,$(wildcard $(BOARD_DIR)$(DELIM)..$(DELIM)common)) + ifeq ($(CONFIG_ARCH_BOARD_COMMON),y) + BOARD_COMMON_DIR ?= $(wildcard $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)common) + endif +else + BOARD_COMMON_DIR ?= $(wildcard $(BOARD_DIR)$(DELIM)..$(DELIM)common) endif BOARD_DRIVERS_DIR ?= $(wildcard $(BOARD_DIR)$(DELIM)..$(DELIM)drivers) ifeq ($(BOARD_DRIVERS_DIR),)