RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

makefiles: use 'BOARDSDIR' for the boards directory in compilation

Browse Source 
Replace uses of 'RIOTBOARD' by 'BOARDSDIR' during the compilation.
This commit is contained in:
Gaëtan Harter 2019-09-09 17:00:59 +02:00 committed by Alexandre Abadie
parent f76a2d201e
commit 90692ac92b
No known key found for this signature in database
GPG Key ID: 1C919A403CAE1405
7 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.dep
View File

@ -6,7 +6,7 @@ OLD_USEPKG := $(sort $(USEPKG))
-include $(APPDIR)/Makefile.board.dep -include $(APPDIR)/Makefile.board.dep
# include board dependencies # include board dependencies
-include $(RIOTBOARD)/$(BOARD)/Makefile.dep -include $(BOARDSDIR)/$(BOARD)/Makefile.dep
# include cpu dependencies # include cpu dependencies
-include $(RIOTCPU)/$(CPU)/Makefile.dep -include $(RIOTCPU)/$(CPU)/Makefile.dep

6
Makefile.features
View File

@ -5,7 +5,11 @@
# This makes them available when setting features based on CPU_MODEL in the cpu # This makes them available when setting features based on CPU_MODEL in the cpu
# Makefile.features and also during dependency resolution. # Makefile.features and also during dependency resolution.
include $(RIOTBOARD)/$(BOARD)/Makefile.features # Transition:
# Moving 'CPU/CPU_MODEL' to Makefile.features is an ongoing work and may not
# reflect the state of all boards for the moment.
include $(BOARDSDIR)/$(BOARD)/Makefile.features
# Sanity check # Sanity check
ifeq (,$(CPU)) ifeq (,$(CPU))

6
Makefile.include
View File

@ -259,7 +259,7 @@ LAZYSPONGE_FLAGS ?= $(if $(filter 1,$(QUIET)),,--verbose)
ifeq (, $(APPLICATION)) ifeq (, $(APPLICATION))
$(error An application name must be specified as APPLICATION.) $(error An application name must be specified as APPLICATION.)
endif endif
ifneq (0,$(shell test -d $(RIOTBOARD)/$(BOARD); echo $$?)) ifneq (0,$(shell test -d $(BOARDSDIR)/$(BOARD); echo $$?))
$(error The specified board $(BOARD) does not exist.) $(error The specified board $(BOARD) does not exist.)
endif endif
@ -317,8 +317,8 @@ include $(RIOTMAKE)/pseudomodules.inc.mk
include $(RIOTMAKE)/defaultmodules.inc.mk include $(RIOTMAKE)/defaultmodules.inc.mk
# Include Board and CPU configuration # Include Board and CPU configuration
INCLUDES += $(addprefix -I,$(wildcard $(RIOTBOARD)/$(BOARD)/include)) INCLUDES += $(addprefix -I,$(wildcard $(BOARDSDIR)/$(BOARD)/include))
include $(RIOTBOARD)/$(BOARD)/Makefile.include include $(BOARDSDIR)/$(BOARD)/Makefile.include
INCLUDES += -I$(RIOTCPU)/$(CPU)/include INCLUDES += -I$(RIOTCPU)/$(CPU)/include
include $(RIOTCPU)/$(CPU)/Makefile.include include $(RIOTCPU)/$(CPU)/Makefile.include

2
makefiles/application.inc.mk
View File

@ -1,6 +1,6 @@
MODULE = $(APPLICATION_MODULE) MODULE = $(APPLICATION_MODULE)
DIRS += $(RIOTCPU)/$(CPU) $(RIOTBOARD)/$(BOARD) DIRS += $(RIOTCPU)/$(CPU) $(BOARDSDIR)/$(BOARD)
DIRS += $(RIOTBASE)/core $(RIOTBASE)/drivers $(RIOTBASE)/sys DIRS += $(RIOTBASE)/core $(RIOTBASE)/drivers $(RIOTBASE)/sys
# For regular modules, adding files to BLOBS to their Makefile is sufficient to # For regular modules, adding files to BLOBS to their Makefile is sufficient to

6
makefiles/boards.inc.mk
View File

@ -1,10 +1,10 @@
# 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
RIOTBOARD ?= $(or $(RIOTBASE),$(CURDIR))/boards BOARDSDIR ?= $(or $(RIOTBASE),$(CURDIR))/boards
# List all boards. # List all boards.
# By default, all directories in RIOTBOARD except 'common' # By default, all directories in BOARDSDIR except 'common'
# use 'wildcard */.' to only list directories # use 'wildcard */.' to only list directories
ALLBOARDS ?= $(sort $(filter-out common,$(patsubst $(RIOTBOARD)/%/.,%,$(wildcard $(RIOTBOARD)/*/.)))) ALLBOARDS ?= $(sort $(filter-out common,$(patsubst $(BOARDSDIR)/%/.,%,$(wildcard $(BOARDSDIR)/*/.))))
# Set the default value from `BOARDS` # Set the default value from `BOARDS`
BOARDS ?= $(ALLBOARDS) BOARDS ?= $(ALLBOARDS)

1
makefiles/info.inc.mk
View File

@ -36,6 +36,7 @@ info-build:
@echo '' @echo ''
@echo 'RIOTBASE: $(RIOTBASE)' @echo 'RIOTBASE: $(RIOTBASE)'
@echo 'RIOTBOARD: $(RIOTBOARD)' @echo 'RIOTBOARD: $(RIOTBOARD)'
@echo 'BOARDSDIR: $(BOARDSDIR)'
@echo 'RIOTCPU: $(RIOTCPU)' @echo 'RIOTCPU: $(RIOTCPU)'
@echo 'RIOTPKG: $(RIOTPKG)' @echo 'RIOTPKG: $(RIOTPKG)'
@echo '' @echo ''

1
makefiles/scan-build.inc.mk
View File

@ -7,6 +7,7 @@ SCANBUILD_ENV_VARS := \
BINDIR \ BINDIR \
BINDIRBASE \ BINDIRBASE \
BOARD \ BOARD \
BOARDSDIR \
BUILD_DIR \ BUILD_DIR \
BUILDRELPATH \ BUILDRELPATH \
CC \ CC \