make: Move BOARD and CPU includes to Makefile.modules

8 years ago · 7835ab2be7
parent fae9a092fd
commit 7835ab2be7
50 changed files with 4 additions and 135 deletions
--- a/Makefile.modules
+++ b/Makefile.modules
@ -4,6 +4,8 @@ include $(RIOTBASE)/Makefile.defaultmodules
 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$(RIOTCPU)/$(CPU)/include
+INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
 ED = $(patsubst %,-DMODULE_%,$(subst -,_,$(USEMODULE) $(USEPKG)))
 ED += $(patsubst %,-DFEATURE_%,$(subst -,_,$(filter $(FEATURES_PROVIDED), $(FEATURES_REQUIRED))))
 EXTDEFINES = $(shell echo $(sort $(ED))|tr 'a-z' 'A-Z')
--- a/boards/Makefile.include.msp430_common
+++ b/boards/Makefile.include.msp430_common
@ -16,6 +16,3 @@ export LINKFLAGS += $(CFLAGS_CPU) -lgcc

 # Import all toolchain settings
 include $(RIOTBOARD)/Makefile.include.gnu
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
--- a/boards/airfy-beacon/Makefile.include
+++ b/boards/airfy-beacon/Makefile.include
@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial

 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
--- a/boards/arduino-due/Makefile.include
+++ b/boards/arduino-due/Makefile.include
@ -12,6 +12,3 @@ export OFLAGS = -O binary

 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
--- a/boards/arduino-mega2560/Makefile.include
+++ b/boards/arduino-mega2560/Makefile.include
@ -1,4 +1,3 @@
-
 # define the cpu used by the arduino mega2560 board
 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 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 board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
--- a/boards/avsextrem/Makefile.include
+++ b/boards/avsextrem/Makefile.include
@ -1,2 +1 @@
-export INCLUDES += -I$(RIOTCPU)/$(CPU)/include/ -I$(RIOTBOARD)/$(BOARD)/include/
 include $(RIOTBOARD)/msba2-common/Makefile.include
--- a/boards/cc2538dk/Makefile.include
+++ b/boards/cc2538dk/Makefile.include
@ -28,6 +28,3 @@ export DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE)
 export RESET_FLAGS = $(BINDIR)

 export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
--- a/boards/chronos/Makefile
+++ b/boards/chronos/Makefile
@ -1,6 +1,5 @@
 MODULE = board

-INCLUDES += -I$(RIOTBOARD)/$(BOARD)/drivers/include
 DIRS = drivers

 include $(RIOTBASE)/Makefile.base
--- a/boards/chronos/Makefile.include
+++ b/boards/chronos/Makefile.include
@ -9,3 +9,5 @@ export FFLAGS = rf2500 "prog $(HEXFILE)"

 # include msp430 base makefile
 include $(RIOTBOARD)/Makefile.include.msp430_common
+
+INCLUDES += -I$(RIOTBOARD)/$(BOARD)/drivers/include
--- a/boards/ek-lm4f120xl/Makefile.include
+++ b/boards/ek-lm4f120xl/Makefile.include
@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial

 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
--- a/boards/f4vi1/Makefile.include
+++ b/boards/f4vi1/Makefile.include
@ -18,6 +18,3 @@ export DEBUGSERVER = st-util
 export OFLAGS = -O binary
 export FFLAGS = write bin/$(BOARD)/$(APPLICATION).hex 0x8000000
 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
--- a/boards/fox/Makefile.include
+++ b/boards/fox/Makefile.include
@ -14,6 +14,3 @@ include $(RIOTBOARD)/Makefile.include.openocd

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

 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
--- a/boards/iotlab-m3/Makefile.include
+++ b/boards/iotlab-m3/Makefile.include
@ -15,6 +15,3 @@ include $(RIOTBOARD)/Makefile.include.openocd

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

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

 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
--- a/boards/msba2/Makefile.include
+++ b/boards/msba2/Makefile.include
@ -1,5 +1,3 @@
-export INCLUDES += -I$(RIOTBOARD)/msba2/include
-
 ifneq (,$(filter gnrc_netif_default,$(USEMODULE)))
 	USEMODULE += cc110x gnrc_netdev2 gnrc_cc110x
 endif
--- a/boards/msbiot/Makefile.include
+++ b/boards/msbiot/Makefile.include
@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial

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

 # include board dependencies
 include $(RIOTBOARD)/$(BOARD)/Makefile.dep
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
--- a/boards/nrf51dongle/Makefile.include
+++ b/boards/nrf51dongle/Makefile.include
@ -21,6 +21,3 @@ export RESET_FLAGS = $(BINDIR)

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

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

 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
--- a/boards/nucleo-f091/Makefile.include
+++ b/boards/nucleo-f091/Makefile.include
@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial

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

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

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

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

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

 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
--- a/boards/openmote-cc2538/Makefile.include
+++ b/boards/openmote-cc2538/Makefile.include
@ -20,6 +20,3 @@ export RESET_FLAGS = $(BINDIR)

 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
--- a/boards/pba-d-01-kw2x/Makefile.include
+++ b/boards/pba-d-01-kw2x/Makefile.include
@ -34,6 +34,3 @@ include $(RIOTBOARD)/Makefile.include.serial

 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
--- a/boards/pca10000/Makefile.include
+++ b/boards/pca10000/Makefile.include
@ -21,6 +21,3 @@ export RESET_FLAGS = $(BINDIR)

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

 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
--- a/boards/pttu/Makefile.include
+++ b/boards/pttu/Makefile.include
@ -1,3 +1 @@
-export INCLUDES += -I$(RIOTBOARD)/pttu/include
-
 include $(RIOTBOARD)/msba2-common/Makefile.include
--- a/boards/qemu-i386/Makefile.include
+++ b/boards/qemu-i386/Makefile.include
@ -1,7 +1,6 @@
 include $(RIOTBOARD)/x86-multiboot-common/Makefile.include

 CFLAGS += -march=i686 -mtune=i686
-CFLAGS += -I$(RIOTBOARD)/qemu-i386/include

 TERMPROG = exec $(RIOTBOARD)/qemu-i386/dist/term.py qemu-system-i386 $(BINDIRBASE) $(HEXFILE)

--- a/boards/remote/Makefile.include
+++ b/boards/remote/Makefile.include
@ -34,6 +34,3 @@ export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb

 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
--- a/boards/saml21-xpro/Makefile.include
+++ b/boards/saml21-xpro/Makefile.include
@ -12,6 +12,3 @@ include $(RIOTBOARD)/Makefile.include.serial

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

 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
--- a/boards/slwstk6220a/Makefile.include
+++ b/boards/slwstk6220a/Makefile.include
@ -15,6 +15,3 @@ include $(RIOTBOARD)/Makefile.include.jlink

 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
--- a/boards/spark-core/Makefile.include
+++ b/boards/spark-core/Makefile.include
@ -23,6 +23,3 @@ include $(RIOTBOARD)/Makefile.include.serial

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

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

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

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

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

 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
--- a/boards/yunjia-nrf51822/Makefile.include
+++ b/boards/yunjia-nrf51822/Makefile.include
@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial

 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
--- a/cpu/Makefile.include.cortexm_common
+++ b/cpu/Makefile.include.cortexm_common
@ -108,9 +108,6 @@ export CFLAGS += -DARM_MATH_CM7
 endif
 endif

-# Include CPU specific includes:
-export INCLUDES += -I$(RIOTCPU)/$(CPU)/include
-
 # Explicitly tell the linker to link the startup code.
 #   Without this the interrupt vectors will not be linked correctly!
 ifeq ($(COMMON_STARTUP),)
--- a/cpu/atmega2560/Makefile.include
+++ b/cpu/atmega2560/Makefile.include
@ -16,13 +16,9 @@ export ATMEGA_COMMON = $(RIOTCPU)/atmega_common/
 # define the linker script to use for this CPU
 #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.
 #   Without this the interrupt vectors will not be linked correctly!
 export UNDEF += $(BINDIR)cpu/startup.o

-
 # CPU depends on the atmega common module, so include it
 include $(ATMEGA_COMMON)Makefile.include
--- a/cpu/lpc2387/Makefile.include
+++ b/cpu/lpc2387/Makefile.include
@ -1,5 +1,3 @@
-INCLUDES += -I$(RIOTCPU)/lpc2387/include
-
 include $(RIOTCPU)/arm7_common/Makefile.include

 USEMODULE += arm7_common periph periph_common bitfield newlib
--- a/cpu/msp430fxyz/Makefile.include
+++ b/cpu/msp430fxyz/Makefile.include
@ -1,5 +1,3 @@
-INCLUDES += -I$(RIOTCPU)/msp430fxyz/include/
-
 include $(RIOTCPU)/msp430-common/Makefile.include

 export USEMODULE += periph periph_common uart_stdio
--- a/cpu/x86/Makefile.include
+++ b/cpu/x86/Makefile.include
@ -1,4 +1,2 @@
-export INCLUDES += -I$(RIOTCPU)/x86/include
-
 export USEMODULE += quad_math
 export USEPKG += tlsf