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

make: Move BOARD and CPU includes to Makefile.modules

Browse Source
This commit is contained in:
Joakim Nohlgård 2016-02-10 07:29:13 +01:00
parent fae9a092fd
commit 7835ab2be7
50 changed files with 4 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.modules
View File

@ -4,6 +4,8 @@ include $(RIOTBASE)/Makefile.defaultmodules
USEMODULE := $(filter-out $(filter-out $(FEATURES_PROVIDED), $(FEATURES_OPTIONAL)), $(sort $(USEMODULE))) USEMODULE := $(filter-out $(filter-out $(FEATURES_PROVIDED), $(FEATURES_OPTIONAL)), $(sort $(USEMODULE)))
INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include
INCLUDES += -I$(RIOTCPU)/$(CPU)/include
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
ED = $(patsubst %,-DMODULE_%,$(subst -,_,$(USEMODULE) $(USEPKG))) ED = $(patsubst %,-DMODULE_%,$(subst -,_,$(USEMODULE) $(USEPKG)))
ED += $(patsubst %,-DFEATURE_%,$(subst -,_,$(filter $(FEATURES_PROVIDED), $(FEATURES_REQUIRED)))) ED += $(patsubst %,-DFEATURE_%,$(subst -,_,$(filter $(FEATURES_PROVIDED), $(FEATURES_REQUIRED))))
EXTDEFINES = $(shell echo $(sort $(ED))|tr 'a-z' 'A-Z') EXTDEFINES = $(shell echo $(sort $(ED))|tr 'a-z' 'A-Z')

3
boards/Makefile.include.msp430_common
View File

@ -16,6 +16,3 @@ export LINKFLAGS += $(CFLAGS_CPU) -lgcc
# Import all toolchain settings # Import all toolchain settings
include $(RIOTBOARD)/Makefile.include.gnu include $(RIOTBOARD)/Makefile.include.gnu
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/airfy-beacon/Makefile.include
View File

@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
# this board uses openocd # this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd include $(RIOTBOARD)/Makefile.include.openocd
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/arduino-due/Makefile.include
View File

@ -12,6 +12,3 @@ export OFLAGS = -O binary
# setup serial terminal # setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial include $(RIOTBOARD)/Makefile.include.serial
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

4
boards/arduino-mega2560/Makefile.include
View File

@ -1,4 +1,3 @@
# define the cpu used by the arduino mega2560 board # define the cpu used by the arduino mega2560 board
export CPU = atmega2560 export CPU = atmega2560
@ -50,6 +49,3 @@ export ASFLAGS += -ggdb -g3 $(CPU_USAGE) $(FPU_USAGE)
export LINKFLAGS += -g3 -ggdb -std=gnu99 $(CPU_USAGE) $(FPU_USAGE) -static -lgcc -e reset_handler export LINKFLAGS += -g3 -ggdb -std=gnu99 $(CPU_USAGE) $(FPU_USAGE) -static -lgcc -e reset_handler
export OFLAGS += -j .text -j .data -O ihex export OFLAGS += -j .text -j .data -O ihex
export FFLAGS += -p m2560 -c $(PROGRAMMER) $(PROGRAMMER_FLAGS) -F -U flash:w:bin/$(BOARD)/$(PROJECT)$(APPLICATION).hex export FFLAGS += -p m2560 -c $(PROGRAMMER) $(PROGRAMMER_FLAGS) -F -U flash:w:bin/$(BOARD)/$(PROJECT)$(APPLICATION).hex
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

1
boards/avsextrem/Makefile.include
View File

@ -1,2 +1 @@
export INCLUDES += -I$(RIOTCPU)/$(CPU)/include/ -I$(RIOTBOARD)/$(BOARD)/include/
include $(RIOTBOARD)/msba2-common/Makefile.include include $(RIOTBOARD)/msba2-common/Makefile.include

3
boards/cc2538dk/Makefile.include
View File

@ -28,6 +28,3 @@ export DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE)
export RESET_FLAGS = $(BINDIR) export RESET_FLAGS = $(BINDIR)
export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

1
boards/chronos/Makefile
View File

@ -1,6 +1,5 @@
MODULE = board MODULE = board
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/drivers/include
DIRS = drivers DIRS = drivers
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
boards/chronos/Makefile.include
View File

@ -9,3 +9,5 @@ export FFLAGS = rf2500 "prog $(HEXFILE)"
# include msp430 base makefile # include msp430 base makefile
include $(RIOTBOARD)/Makefile.include.msp430_common include $(RIOTBOARD)/Makefile.include.msp430_common
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/drivers/include

3
boards/ek-lm4f120xl/Makefile.include
View File

@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
# this board uses openocd # this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd include $(RIOTBOARD)/Makefile.include.openocd
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/f4vi1/Makefile.include
View File

@ -18,6 +18,3 @@ export DEBUGSERVER = st-util
export OFLAGS = -O binary export OFLAGS = -O binary
export FFLAGS = write bin/$(BOARD)/$(APPLICATION).hex 0x8000000 export FFLAGS = write bin/$(BOARD)/$(APPLICATION).hex 0x8000000
export DEBUGGER_FLAGS = $(RIOTBOARD)/$(BOARD)/dist/gdb.conf $(BINDIR)/$(APPLICATION).elf export DEBUGGER_FLAGS = $(RIOTBOARD)/$(BOARD)/dist/gdb.conf $(BINDIR)/$(APPLICATION).elf
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/fox/Makefile.include
View File

@ -14,6 +14,3 @@ include $(RIOTBOARD)/Makefile.include.openocd
# include board dependencies # include board dependencies
include $(RIOTBOARD)/$(BOARD)/Makefile.dep include $(RIOTBOARD)/$(BOARD)/Makefile.dep
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/frdm-k64f/Makefile.include
View File

@ -30,6 +30,3 @@ include $(RIOTBOARD)/Makefile.include.serial
# this board uses openocd # this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd include $(RIOTBOARD)/Makefile.include.openocd
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/iotlab-m3/Makefile.include
View File

@ -15,6 +15,3 @@ include $(RIOTBOARD)/Makefile.include.openocd
# include board dependencies # include board dependencies
include $(RIOTBOARD)/$(BOARD)/Makefile.dep include $(RIOTBOARD)/$(BOARD)/Makefile.dep
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/limifrog-v1/Makefile.include
View File

@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
# this board uses openocd # this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd include $(RIOTBOARD)/Makefile.include.openocd
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/mbed_lpc1768/Makefile.include
View File

@ -16,6 +16,3 @@ PORT_DARWIN ?= $(shell ls -1 /dev/tty.SLAB_USBtoUART* | head -n 1)
# setup serial terminal # setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial include $(RIOTBOARD)/Makefile.include.serial
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

2
boards/msba2/Makefile.include
View File

@ -1,5 +1,3 @@
export INCLUDES += -I$(RIOTBOARD)/msba2/include
ifneq (,$(filter gnrc_netif_default,$(USEMODULE))) ifneq (,$(filter gnrc_netif_default,$(USEMODULE)))
USEMODULE += cc110x gnrc_netdev2 gnrc_cc110x USEMODULE += cc110x gnrc_netdev2 gnrc_cc110x
endif endif

3
boards/msbiot/Makefile.include
View File

@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
# this board uses openocd # this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd include $(RIOTBOARD)/Makefile.include.openocd
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/mulle/Makefile.include
View File

@ -114,6 +114,3 @@ include $(RIOTBOARD)/Makefile.include.serial
# include board dependencies # include board dependencies
include $(RIOTBOARD)/$(BOARD)/Makefile.dep include $(RIOTBOARD)/$(BOARD)/Makefile.dep
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/nrf51dongle/Makefile.include
View File

@ -21,6 +21,3 @@ export RESET_FLAGS = $(BINDIR)
# setup serial terminal # setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial include $(RIOTBOARD)/Makefile.include.serial
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/nrf52dk/Makefile.include
View File

@ -15,6 +15,3 @@ include $(RIOTBOARD)/Makefile.include.jlink
# setup serial terminal # setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial include $(RIOTBOARD)/Makefile.include.serial
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/nrf6310/Makefile.include
View File

@ -21,6 +21,3 @@ export RESET_FLAGS = $(BINDIR)
# setup serial terminal # setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial include $(RIOTBOARD)/Makefile.include.serial
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/nucleo-f091/Makefile.include
View File

@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
# this board uses openocd # this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd include $(RIOTBOARD)/Makefile.include.openocd
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/nucleo-f103/Makefile.include
View File

@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
# this board uses openocd # this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd include $(RIOTBOARD)/Makefile.include.openocd
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/nucleo-f303/Makefile.include
View File

@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
# this board uses openocd # this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd include $(RIOTBOARD)/Makefile.include.openocd
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/nucleo-f334/Makefile.include
View File

@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
# this board uses openocd # this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd include $(RIOTBOARD)/Makefile.include.openocd
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/nucleo-f401/Makefile.include
View File

@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
# this board uses openocd # this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd include $(RIOTBOARD)/Makefile.include.openocd
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/nucleo-l1/Makefile.include
View File

@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
# this board uses openocd # this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd include $(RIOTBOARD)/Makefile.include.openocd
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/openmote-cc2538/Makefile.include
View File

@ -20,6 +20,3 @@ export RESET_FLAGS = $(BINDIR)
# setup serial terminal # setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial include $(RIOTBOARD)/Makefile.include.serial
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/pba-d-01-kw2x/Makefile.include
View File

@ -34,6 +34,3 @@ include $(RIOTBOARD)/Makefile.include.serial
# this board uses openocd # this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd include $(RIOTBOARD)/Makefile.include.openocd
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/pca10000/Makefile.include
View File

@ -21,6 +21,3 @@ export RESET_FLAGS = $(BINDIR)
# setup serial terminal # setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial include $(RIOTBOARD)/Makefile.include.serial
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/pca10005/Makefile.include
View File

@ -21,6 +21,3 @@ export RESET_FLAGS = $(BINDIR)
# setup serial terminal # setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial include $(RIOTBOARD)/Makefile.include.serial
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

2
boards/pttu/Makefile.include
View File

@ -1,3 +1 @@
export INCLUDES += -I$(RIOTBOARD)/pttu/include
include $(RIOTBOARD)/msba2-common/Makefile.include include $(RIOTBOARD)/msba2-common/Makefile.include

1
boards/qemu-i386/Makefile.include
View File

@ -1,7 +1,6 @@
include $(RIOTBOARD)/x86-multiboot-common/Makefile.include include $(RIOTBOARD)/x86-multiboot-common/Makefile.include
CFLAGS += -march=i686 -mtune=i686 CFLAGS += -march=i686 -mtune=i686
CFLAGS += -I$(RIOTBOARD)/qemu-i386/include
TERMPROG = exec $(RIOTBOARD)/qemu-i386/dist/term.py qemu-system-i386 $(BINDIRBASE) $(HEXFILE) TERMPROG = exec $(RIOTBOARD)/qemu-i386/dist/term.py qemu-system-i386 $(BINDIRBASE) $(HEXFILE)

3
boards/remote/Makefile.include
View File

@ -34,6 +34,3 @@ export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb
# setup serial terminal # setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial include $(RIOTBOARD)/Makefile.include.serial
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/saml21-xpro/Makefile.include
View File

@ -12,6 +12,3 @@ include $(RIOTBOARD)/Makefile.include.serial
# this board uses openocd # this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd include $(RIOTBOARD)/Makefile.include.openocd
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/samr21-xpro/Makefile.include
View File

@ -26,6 +26,3 @@ endif
# this board uses openocd # this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd include $(RIOTBOARD)/Makefile.include.openocd
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/slwstk6220a/Makefile.include
View File

@ -15,6 +15,3 @@ include $(RIOTBOARD)/Makefile.include.jlink
# setup serial terminal # setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial include $(RIOTBOARD)/Makefile.include.serial
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/spark-core/Makefile.include
View File

@ -23,6 +23,3 @@ include $(RIOTBOARD)/Makefile.include.serial
# this board uses openocd # this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd include $(RIOTBOARD)/Makefile.include.openocd
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/stm32f0discovery/Makefile.include
View File

@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
# this board uses openocd # this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd include $(RIOTBOARD)/Makefile.include.openocd
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/stm32f3discovery/Makefile.include
View File

@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
# this board uses openocd # this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd include $(RIOTBOARD)/Makefile.include.openocd
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/stm32f4discovery/Makefile.include
View File

@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
# this board uses openocd # this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd include $(RIOTBOARD)/Makefile.include.openocd
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/udoo/Makefile.include
View File

@ -22,6 +22,3 @@ export FFLAGS = -R -e -w -v -b bin/$(BOARD)/$(APPLICATION).hex
# setup serial terminal # setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial include $(RIOTBOARD)/Makefile.include.serial
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/weio/Makefile.include
View File

@ -16,6 +16,3 @@ PORT_DARWIN ?= $(shell ls -1 /dev/tty.SLAB_USBtoUART* | head -n 1)
# setup serial terminal # setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial include $(RIOTBOARD)/Makefile.include.serial
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
boards/yunjia-nrf51822/Makefile.include
View File

@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
# this board uses openocd # this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd include $(RIOTBOARD)/Makefile.include.openocd
# export board specific includes to the global includes-listing
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

3
cpu/Makefile.include.cortexm_common
View File

@ -108,9 +108,6 @@ export CFLAGS += -DARM_MATH_CM7
endif endif
endif endif
# Include CPU specific includes:
export INCLUDES += -I$(RIOTCPU)/$(CPU)/include
# Explicitly tell the linker to link the startup code. # Explicitly tell the linker to link the startup code.
# Without this the interrupt vectors will not be linked correctly! # Without this the interrupt vectors will not be linked correctly!
ifeq ($(COMMON_STARTUP),) ifeq ($(COMMON_STARTUP),)

4
cpu/atmega2560/Makefile.include
View File

@ -16,13 +16,9 @@ export ATMEGA_COMMON = $(RIOTCPU)/atmega_common/
# define the linker script to use for this CPU # define the linker script to use for this CPU
#export LINKERSCRIPT = $(RIOTCPU)/$(CPU)/ldscripts/atmega2560.ld #export LINKERSCRIPT = $(RIOTCPU)/$(CPU)/ldscripts/atmega2560.ld
# include CPU specific includes
export INCLUDES += -I$(RIOTCPU)/$(CPU)/include
# explicitly tell the linker to link the syscalls and startup code. # explicitly tell the linker to link the syscalls and startup code.
# Without this the interrupt vectors will not be linked correctly! # Without this the interrupt vectors will not be linked correctly!
export UNDEF += $(BINDIR)cpu/startup.o export UNDEF += $(BINDIR)cpu/startup.o
# CPU depends on the atmega common module, so include it # CPU depends on the atmega common module, so include it
include $(ATMEGA_COMMON)Makefile.include include $(ATMEGA_COMMON)Makefile.include

2
cpu/lpc2387/Makefile.include
View File

@ -1,5 +1,3 @@
INCLUDES += -I$(RIOTCPU)/lpc2387/include
include $(RIOTCPU)/arm7_common/Makefile.include include $(RIOTCPU)/arm7_common/Makefile.include
USEMODULE += arm7_common periph periph_common bitfield newlib USEMODULE += arm7_common periph periph_common bitfield newlib

2
cpu/msp430fxyz/Makefile.include
View File

@ -1,5 +1,3 @@
INCLUDES += -I$(RIOTCPU)/msp430fxyz/include/
include $(RIOTCPU)/msp430-common/Makefile.include include $(RIOTCPU)/msp430-common/Makefile.include
export USEMODULE += periph periph_common uart_stdio export USEMODULE += periph periph_common uart_stdio

2
cpu/x86/Makefile.include
View File

@ -1,4 +1,2 @@
export INCLUDES += -I$(RIOTCPU)/x86/include
export USEMODULE += quad_math export USEMODULE += quad_math
export USEPKG += tlsf export USEPKG += tlsf