mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
makefiles: use 'BOARDSDIR' for the boards directory in compilation
Replace uses of 'RIOTBOARD' by 'BOARDSDIR' during the compilation.
This commit is contained in:
parent
f76a2d201e
commit
90692ac92b
@ -6,7 +6,7 @@ OLD_USEPKG := $(sort $(USEPKG))
|
||||
-include $(APPDIR)/Makefile.board.dep
|
||||
|
||||
# include board dependencies
|
||||
-include $(RIOTBOARD)/$(BOARD)/Makefile.dep
|
||||
-include $(BOARDSDIR)/$(BOARD)/Makefile.dep
|
||||
|
||||
# include cpu dependencies
|
||||
-include $(RIOTCPU)/$(CPU)/Makefile.dep
|
||||
|
@ -5,7 +5,11 @@
|
||||
# This makes them available when setting features based on CPU_MODEL in the cpu
|
||||
# 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
|
||||
ifeq (,$(CPU))
|
||||
|
@ -259,7 +259,7 @@ LAZYSPONGE_FLAGS ?= $(if $(filter 1,$(QUIET)),,--verbose)
|
||||
ifeq (, $(APPLICATION))
|
||||
$(error An application name must be specified as APPLICATION.)
|
||||
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.)
|
||||
endif
|
||||
|
||||
@ -317,8 +317,8 @@ include $(RIOTMAKE)/pseudomodules.inc.mk
|
||||
include $(RIOTMAKE)/defaultmodules.inc.mk
|
||||
|
||||
# Include Board and CPU configuration
|
||||
INCLUDES += $(addprefix -I,$(wildcard $(RIOTBOARD)/$(BOARD)/include))
|
||||
include $(RIOTBOARD)/$(BOARD)/Makefile.include
|
||||
INCLUDES += $(addprefix -I,$(wildcard $(BOARDSDIR)/$(BOARD)/include))
|
||||
include $(BOARDSDIR)/$(BOARD)/Makefile.include
|
||||
INCLUDES += -I$(RIOTCPU)/$(CPU)/include
|
||||
include $(RIOTCPU)/$(CPU)/Makefile.include
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
MODULE = $(APPLICATION_MODULE)
|
||||
|
||||
DIRS += $(RIOTCPU)/$(CPU) $(RIOTBOARD)/$(BOARD)
|
||||
DIRS += $(RIOTCPU)/$(CPU) $(BOARDSDIR)/$(BOARD)
|
||||
DIRS += $(RIOTBASE)/core $(RIOTBASE)/drivers $(RIOTBASE)/sys
|
||||
|
||||
# For regular modules, adding files to BLOBS to their Makefile is sufficient to
|
||||
|
@ -1,10 +1,10 @@
|
||||
# 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.
|
||||
# By default, all directories in RIOTBOARD except 'common'
|
||||
# By default, all directories in BOARDSDIR except 'common'
|
||||
# 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`
|
||||
BOARDS ?= $(ALLBOARDS)
|
||||
|
@ -36,6 +36,7 @@ info-build:
|
||||
@echo ''
|
||||
@echo 'RIOTBASE: $(RIOTBASE)'
|
||||
@echo 'RIOTBOARD: $(RIOTBOARD)'
|
||||
@echo 'BOARDSDIR: $(BOARDSDIR)'
|
||||
@echo 'RIOTCPU: $(RIOTCPU)'
|
||||
@echo 'RIOTPKG: $(RIOTPKG)'
|
||||
@echo ''
|
||||
|
@ -7,6 +7,7 @@ SCANBUILD_ENV_VARS := \
|
||||
BINDIR \
|
||||
BINDIRBASE \
|
||||
BOARD \
|
||||
BOARDSDIR \
|
||||
BUILD_DIR \
|
||||
BUILDRELPATH \
|
||||
CC \
|
||||
|
Loading…
Reference in New Issue
Block a user