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

Merge pull request #14385 from aabadie/pr/make/appdeps_export

Browse Source 
boards/mips: remove use of APPDEPS, un-export globally APPDEPS
This commit is contained in:
Francisco 2020-07-01 09:13:35 +02:00 committed by GitHub
commit 41888674a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/6lowpan-clicker/Makefile.include
View File

@ -1,5 +1,3 @@
APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S
# use pic32prog by default to program this board
PROGRAMMER ?= pic32prog

2
boards/pic32-wifire/Makefile.include
View File

@ -1,5 +1,3 @@
APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S
PORT_LINUX ?= /dev/ttyUSB0
include $(RIOTMAKE)/tools/serial.inc.mk

4
cpu/mips_pic32_common/Makefile.dep
View File

@ -4,4 +4,8 @@ USEMODULE += mips_pic32_common_periph
# mips32 needs periph_timer for its gettimeofday() implementation
USEMODULE += periph_timer
# add module defining cpu model specific symbols. This module is located in
# $(RIOTCPU)/$(CPU)/$(CPU_MODEL)
USEMODULE += $(CPU_MODEL)
include $(RIOTCPU)/mips32r2_common/Makefile.dep

2
cpu/mips_pic32_common/Makefile.include
View File

@ -3,3 +3,5 @@ include $(RIOTCPU)/mips32r2_common/Makefile.include
CFLAGS += -DCPU_FAM_$(call uppercase_and_underscore,$(CPU_FAM))
INCLUDES += -I$(RIOTCPU)/mips_pic32_common/include
DIRS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)

2
dist/tools/buildsystem_sanity_check/check.sh vendored
View File

@ -109,9 +109,9 @@ UNEXPORTED_VARIABLES+=('JLINK_DEVICE' 'JLINK_IF')
UNEXPORTED_VARIABLES+=('JLINK_PRE_FLASH' 'JLINK_RESET_FILE')
UNEXPORTED_VARIABLES+=('GIT_CACHE' 'GIT_CACHE_DIR')
UNEXPORTED_VARIABLES+=('LINKXX')
UNEXPORTED_VARIABLES+=('APPDEPS' 'BUILDDEPS' 'DEBUGDEPS')
EXPORTED_VARIABLES_ONLY_IN_VARS=()
EXPORTED_VARIABLES_ONLY_IN_VARS+=('APPDEPS')
EXPORTED_VARIABLES_ONLY_IN_VARS+=('CPU_ARCH')
EXPORTED_VARIABLES_ONLY_IN_VARS+=('CPU_CORE')
EXPORTED_VARIABLES_ONLY_IN_VARS+=('CPU_FAM')

2
makefiles/vars.inc.mk
View File

@ -23,7 +23,7 @@ export NATIVEINCLUDES # The native include paths, set by the various nati
export USEMODULE # Sys Module dependencies of the application. Set in the application's Makefile.
export USEPKG # Pkg dependencies (third party modules) of the application. Set in the application's Makefile.
export DISABLE_MODULE # Used in the application's Makefile to suppress DEFAULT_MODULEs.
export APPDEPS # Files / Makefile targets that need to be created before the application can be build. Set in the application's Makefile.
# APPDEPS # Files / Makefile targets that need to be created before the application can be build. Set in the application's Makefile.
# BUILDDEPS # Files / Makefile targets that need to be created before starting to build.
# DEBUGDEPS # Files / Makefile targets that need to be created before starting a debug session.