From 7835ab2be7b2b9d503bad6bd50f89051da86d24c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se> Date: Wed, 10 Feb 2016 07:29:13 +0100 Subject: [PATCH] make: Move BOARD and CPU includes to Makefile.modules --- Makefile.modules | 2 ++ boards/Makefile.include.msp430_common | 3 --- boards/airfy-beacon/Makefile.include | 3 --- boards/arduino-due/Makefile.include | 3 --- boards/arduino-mega2560/Makefile.include | 4 ---- boards/avsextrem/Makefile.include | 1 - boards/cc2538dk/Makefile.include | 3 --- boards/chronos/Makefile | 1 - boards/chronos/Makefile.include | 2 ++ boards/ek-lm4f120xl/Makefile.include | 3 --- boards/f4vi1/Makefile.include | 3 --- boards/fox/Makefile.include | 3 --- boards/frdm-k64f/Makefile.include | 3 --- boards/iotlab-m3/Makefile.include | 3 --- boards/limifrog-v1/Makefile.include | 3 --- boards/mbed_lpc1768/Makefile.include | 3 --- boards/msba2/Makefile.include | 2 -- boards/msbiot/Makefile.include | 3 --- boards/mulle/Makefile.include | 3 --- boards/nrf51dongle/Makefile.include | 3 --- boards/nrf52dk/Makefile.include | 3 --- boards/nrf6310/Makefile.include | 3 --- boards/nucleo-f091/Makefile.include | 3 --- boards/nucleo-f103/Makefile.include | 3 --- boards/nucleo-f303/Makefile.include | 3 --- boards/nucleo-f334/Makefile.include | 3 --- boards/nucleo-f401/Makefile.include | 3 --- boards/nucleo-l1/Makefile.include | 3 --- boards/openmote-cc2538/Makefile.include | 3 --- boards/pba-d-01-kw2x/Makefile.include | 3 --- boards/pca10000/Makefile.include | 3 --- boards/pca10005/Makefile.include | 3 --- boards/pttu/Makefile.include | 2 -- boards/qemu-i386/Makefile.include | 1 - boards/remote/Makefile.include | 3 --- boards/saml21-xpro/Makefile.include | 3 --- boards/samr21-xpro/Makefile.include | 3 --- boards/slwstk6220a/Makefile.include | 3 --- boards/spark-core/Makefile.include | 3 --- boards/stm32f0discovery/Makefile.include | 3 --- boards/stm32f3discovery/Makefile.include | 3 --- boards/stm32f4discovery/Makefile.include | 3 --- boards/udoo/Makefile.include | 3 --- boards/weio/Makefile.include | 3 --- boards/yunjia-nrf51822/Makefile.include | 3 --- cpu/Makefile.include.cortexm_common | 3 --- cpu/atmega2560/Makefile.include | 4 ---- cpu/lpc2387/Makefile.include | 2 -- cpu/msp430fxyz/Makefile.include | 2 -- cpu/x86/Makefile.include | 2 -- 50 files changed, 4 insertions(+), 135 deletions(-) diff --git a/Makefile.modules b/Makefile.modules index 5f21180645..37bef54fde 100644 --- 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') diff --git a/boards/Makefile.include.msp430_common b/boards/Makefile.include.msp430_common index 385f771f10..5b9014b8e0 100644 --- 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 diff --git a/boards/airfy-beacon/Makefile.include b/boards/airfy-beacon/Makefile.include index 3cdcc1f1cf..cc8572b7cc 100644 --- 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 diff --git a/boards/arduino-due/Makefile.include b/boards/arduino-due/Makefile.include index 1a3bcc0fe2..10b858a74b 100644 --- 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 diff --git a/boards/arduino-mega2560/Makefile.include b/boards/arduino-mega2560/Makefile.include index 9e8bfa7551..54656f0dff 100644 --- 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 diff --git a/boards/avsextrem/Makefile.include b/boards/avsextrem/Makefile.include index 3fa007f117..814b729673 100644 --- 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 diff --git a/boards/cc2538dk/Makefile.include b/boards/cc2538dk/Makefile.include index 248c29c1b4..22796de1ee 100644 --- 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 diff --git a/boards/chronos/Makefile b/boards/chronos/Makefile index 2c34df4626..1f64a6ab76 100644 --- 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 diff --git a/boards/chronos/Makefile.include b/boards/chronos/Makefile.include index c09da24996..af3734e43d 100644 --- 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 diff --git a/boards/ek-lm4f120xl/Makefile.include b/boards/ek-lm4f120xl/Makefile.include index 03b0a11584..94d7395388 100644 --- 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 diff --git a/boards/f4vi1/Makefile.include b/boards/f4vi1/Makefile.include index e976ab3b41..1d9b4b0200 100644 --- 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 diff --git a/boards/fox/Makefile.include b/boards/fox/Makefile.include index a05abe4dae..fe9d27d108 100644 --- 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 diff --git a/boards/frdm-k64f/Makefile.include b/boards/frdm-k64f/Makefile.include index ee6c642370..1ade261057 100644 --- 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 diff --git a/boards/iotlab-m3/Makefile.include b/boards/iotlab-m3/Makefile.include index 42a0be92f4..f291c025ca 100644 --- 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 diff --git a/boards/limifrog-v1/Makefile.include b/boards/limifrog-v1/Makefile.include index a935b0a03d..e40282f74a 100644 --- 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 diff --git a/boards/mbed_lpc1768/Makefile.include b/boards/mbed_lpc1768/Makefile.include index 517e252823..630e0528f2 100644 --- 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 diff --git a/boards/msba2/Makefile.include b/boards/msba2/Makefile.include index 2a3412a209..3d18799b8c 100644 --- 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 diff --git a/boards/msbiot/Makefile.include b/boards/msbiot/Makefile.include index 9b05cc5cac..2f8ee328ff 100644 --- 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 diff --git a/boards/mulle/Makefile.include b/boards/mulle/Makefile.include index 50025b3d4b..89f73f7287 100644 --- 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 diff --git a/boards/nrf51dongle/Makefile.include b/boards/nrf51dongle/Makefile.include index 19103c1cb5..6181022622 100644 --- 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 diff --git a/boards/nrf52dk/Makefile.include b/boards/nrf52dk/Makefile.include index 9841ec1256..e6a37d3ae9 100644 --- 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 diff --git a/boards/nrf6310/Makefile.include b/boards/nrf6310/Makefile.include index 6d78a23280..6fcf0d217d 100644 --- 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 diff --git a/boards/nucleo-f091/Makefile.include b/boards/nucleo-f091/Makefile.include index 82ed8e988b..97b59fc9e0 100644 --- 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 diff --git a/boards/nucleo-f103/Makefile.include b/boards/nucleo-f103/Makefile.include index 1ae8f0012d..a23e997856 100755 --- 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 diff --git a/boards/nucleo-f303/Makefile.include b/boards/nucleo-f303/Makefile.include index 63e3e02739..b65ef8a2c5 100755 --- 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 diff --git a/boards/nucleo-f334/Makefile.include b/boards/nucleo-f334/Makefile.include index 4feabd9202..b3d8ea9bea 100644 --- 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 diff --git a/boards/nucleo-f401/Makefile.include b/boards/nucleo-f401/Makefile.include index da3438372b..5d99f17c20 100644 --- 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 diff --git a/boards/nucleo-l1/Makefile.include b/boards/nucleo-l1/Makefile.include index d2bf5ec656..dd05d8f352 100644 --- 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 diff --git a/boards/openmote-cc2538/Makefile.include b/boards/openmote-cc2538/Makefile.include index 2ed848a1c7..0054a3f419 100644 --- 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 diff --git a/boards/pba-d-01-kw2x/Makefile.include b/boards/pba-d-01-kw2x/Makefile.include index 2f0d9dd9d0..649e536d1b 100644 --- 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 diff --git a/boards/pca10000/Makefile.include b/boards/pca10000/Makefile.include index 021d33363e..a596a23c7c 100644 --- 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 diff --git a/boards/pca10005/Makefile.include b/boards/pca10005/Makefile.include index 6d78a23280..6fcf0d217d 100644 --- 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 diff --git a/boards/pttu/Makefile.include b/boards/pttu/Makefile.include index cb34c2c317..814b729673 100644 --- 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 diff --git a/boards/qemu-i386/Makefile.include b/boards/qemu-i386/Makefile.include index 581b8a8783..fdcbc47a76 100644 --- 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) diff --git a/boards/remote/Makefile.include b/boards/remote/Makefile.include index bdc2f0efb7..7eb3015c0e 100644 --- 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 diff --git a/boards/saml21-xpro/Makefile.include b/boards/saml21-xpro/Makefile.include index 88238eb814..988b77ad76 100644 --- 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 diff --git a/boards/samr21-xpro/Makefile.include b/boards/samr21-xpro/Makefile.include index a30b8f2fd5..f16f5d8744 100644 --- 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 diff --git a/boards/slwstk6220a/Makefile.include b/boards/slwstk6220a/Makefile.include index 8352d79ad2..59057d72b3 100644 --- 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 diff --git a/boards/spark-core/Makefile.include b/boards/spark-core/Makefile.include index 57149595eb..7ab641a023 100644 --- 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 diff --git a/boards/stm32f0discovery/Makefile.include b/boards/stm32f0discovery/Makefile.include index b7f480a9b2..9bce9d87bb 100644 --- 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 diff --git a/boards/stm32f3discovery/Makefile.include b/boards/stm32f3discovery/Makefile.include index 642cfe7a4d..fa0286a256 100644 --- 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 diff --git a/boards/stm32f4discovery/Makefile.include b/boards/stm32f4discovery/Makefile.include index bcecac524a..a06d871f3e 100644 --- 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 diff --git a/boards/udoo/Makefile.include b/boards/udoo/Makefile.include index 11b417d862..c732861485 100644 --- 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 diff --git a/boards/weio/Makefile.include b/boards/weio/Makefile.include index 85e9b43810..87461024c1 100644 --- 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 diff --git a/boards/yunjia-nrf51822/Makefile.include b/boards/yunjia-nrf51822/Makefile.include index 3cdcc1f1cf..cc8572b7cc 100644 --- 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 diff --git a/cpu/Makefile.include.cortexm_common b/cpu/Makefile.include.cortexm_common index 1d586fb170..c19cf959d2 100644 --- 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),) diff --git a/cpu/atmega2560/Makefile.include b/cpu/atmega2560/Makefile.include index c4c2343655..a3ddf00809 100644 --- 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 diff --git a/cpu/lpc2387/Makefile.include b/cpu/lpc2387/Makefile.include index 438dbb2c88..afbb4778a0 100644 --- 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 diff --git a/cpu/msp430fxyz/Makefile.include b/cpu/msp430fxyz/Makefile.include index fd4c822745..b393e72c87 100644 --- 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 diff --git a/cpu/x86/Makefile.include b/cpu/x86/Makefile.include index ab760c38e1..d977bb3dff 100644 --- 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 -- GitLab