riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13198 from fjmolinas/pr_fix_info_board_RIOTBASE

Browse Source 
makefiles/boards.inc.mk: set RIOTBOARD
This commit is contained in:
Leandro Lanzieri 2020-01-27 09:57:45 +01:00 committed by GitHub
commit c5dfc7d16c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
makefiles/boards.inc.mk
View File

@ -1,5 +1,6 @@
# Default when RIOTBASE is not set and is executed from the RIOT directory # 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 # List all boards in a directory
# By default, all directories in BOARDSDIR except 'common' # By default, all directories in BOARDSDIR except 'common'
@ -11,8 +12,8 @@ ifneq ($(RIOTBOARD),$(BOARDSDIR))
ALLBOARDS_RIOTBOARD ?= $(call _get_boards_in_directory,$(RIOTBOARD)) ALLBOARDS_RIOTBOARD ?= $(call _get_boards_in_directory,$(RIOTBOARD))
endif endif
# Get all boards # Use `:=` so that it is evaluated before BOARDSDIR gets eventually changed
ALLBOARDS ?= $(sort $(call _get_boards_in_directory,$(BOARDSDIR)) $(ALLBOARDS_RIOTBOARD)) ALLBOARDS := $(sort $(call _get_boards_in_directory,$(BOARDSDIR)) $(ALLBOARDS_RIOTBOARD))
# Set the default value from `BOARDS` # Set the default value from `BOARDS`
BOARDS ?= $(ALLBOARDS) BOARDS ?= $(ALLBOARDS)