From 1f844fb99adfac004ab4f1578f21a867d911da47 Mon Sep 17 00:00:00 2001 From: Francisco Molina Date: Fri, 24 Jan 2020 14:45:24 +0100 Subject: [PATCH 1/2] makefiles/boards.inc.mk: set RIOTBOARD --- makefiles/boards.inc.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/makefiles/boards.inc.mk b/makefiles/boards.inc.mk index 27fe0b3836..15b67f7803 100644 --- a/makefiles/boards.inc.mk +++ b/makefiles/boards.inc.mk @@ -1,5 +1,6 @@ # Default when RIOTBASE is not set and is executed from the RIOT directory -BOARDSDIR ?= $(or $(RIOTBASE),$(CURDIR))/boards +RIOTBOARD ?= $(or $(RIOTBASE),$(CURDIR))/boards +BOARDSDIR ?= $(RIOTBOARD) # List all boards in a directory # By default, all directories in BOARDSDIR except 'common' From ff70ad377a5d050bb5078036b706c99c70860627 Mon Sep 17 00:00:00 2001 From: Francisco Molina Date: Fri, 24 Jan 2020 17:59:46 +0100 Subject: [PATCH 2/2] makefiles/boards.inc.mk: simply expand ALLBOARDS We can't use memoized here since if we don't expand immediatly the value for BOARDSDIR might change. --- makefiles/boards.inc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefiles/boards.inc.mk b/makefiles/boards.inc.mk index 15b67f7803..7d7374d1af 100644 --- a/makefiles/boards.inc.mk +++ b/makefiles/boards.inc.mk @@ -12,8 +12,8 @@ ifneq ($(RIOTBOARD),$(BOARDSDIR)) ALLBOARDS_RIOTBOARD ?= $(call _get_boards_in_directory,$(RIOTBOARD)) endif -# Get all boards -ALLBOARDS ?= $(sort $(call _get_boards_in_directory,$(BOARDSDIR)) $(ALLBOARDS_RIOTBOARD)) +# Use `:=` so that it is evaluated before BOARDSDIR gets eventually changed +ALLBOARDS := $(sort $(call _get_boards_in_directory,$(BOARDSDIR)) $(ALLBOARDS_RIOTBOARD)) # Set the default value from `BOARDS` BOARDS ?= $(ALLBOARDS)