From 6fc8fae2c878dda29cfdcf2e681e4145f2ee0a0b Mon Sep 17 00:00:00 2001 From: cladmi <gaetan.harter@fu-berlin.de> Date: Tue, 11 Sep 2018 16:28:18 +0200 Subject: [PATCH] boards/Makefile.include: remove duplicate includes Includes of $(CPU)/include and $(BOARD)/include and already added in the main Makefile.include. Verification: There are no common headers names between boards and cpus. Except native that has a 'periph_conf.h' in cpu instead of being in board. --- boards/arduino-mkr1000/Makefile.include | 3 --- boards/arduino-mkrfox1200/Makefile.include | 3 --- boards/arduino-mkrzero/Makefile.include | 3 --- boards/iotlab-a8-m3/Makefile.include | 3 --- boards/iotlab-m3/Makefile.include | 3 --- boards/mips-malta/Makefile.include | 1 - boards/nz32-sc151/Makefile.include | 2 -- boards/pic32-clicker/Makefile.include | 1 - boards/pic32-wifire/Makefile.include | 1 - boards/spark-core/Makefile.include | 2 -- 10 files changed, 22 deletions(-) diff --git a/boards/arduino-mkr1000/Makefile.include b/boards/arduino-mkr1000/Makefile.include index 49453ce50d..1183d0a3dc 100644 --- a/boards/arduino-mkr1000/Makefile.include +++ b/boards/arduino-mkr1000/Makefile.include @@ -5,6 +5,3 @@ ifeq ($(PROGRAMMER),jlink) endif include $(RIOTBOARD)/common/arduino-mkr/Makefile.include - -# add arduino-mkr1000 include path -INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include diff --git a/boards/arduino-mkrfox1200/Makefile.include b/boards/arduino-mkrfox1200/Makefile.include index 6cdeddbe11..8c5a271f09 100644 --- a/boards/arduino-mkrfox1200/Makefile.include +++ b/boards/arduino-mkrfox1200/Makefile.include @@ -5,6 +5,3 @@ ifeq ($(PROGRAMMER),jlink) endif include $(RIOTBOARD)/common/arduino-mkr/Makefile.include - -# add arduino-mkrfox1200 include path -INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include diff --git a/boards/arduino-mkrzero/Makefile.include b/boards/arduino-mkrzero/Makefile.include index 4b920dfa56..8c5a271f09 100644 --- a/boards/arduino-mkrzero/Makefile.include +++ b/boards/arduino-mkrzero/Makefile.include @@ -5,6 +5,3 @@ ifeq ($(PROGRAMMER),jlink) endif include $(RIOTBOARD)/common/arduino-mkr/Makefile.include - -# add arduino-mkrzero include path -INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include diff --git a/boards/iotlab-a8-m3/Makefile.include b/boards/iotlab-a8-m3/Makefile.include index b28dc220fb..d54c70cfc5 100644 --- a/boards/iotlab-a8-m3/Makefile.include +++ b/boards/iotlab-a8-m3/Makefile.include @@ -1,6 +1,3 @@ USEMODULE += boards_common_iotlab include $(RIOTBOARD)/common/iotlab/Makefile.include - -# add iotlab-a8-m3 include path -INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include diff --git a/boards/iotlab-m3/Makefile.include b/boards/iotlab-m3/Makefile.include index ec728d367a..d54c70cfc5 100644 --- a/boards/iotlab-m3/Makefile.include +++ b/boards/iotlab-m3/Makefile.include @@ -1,6 +1,3 @@ USEMODULE += boards_common_iotlab include $(RIOTBOARD)/common/iotlab/Makefile.include - -# add iotlab-m3 include path -INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include diff --git a/boards/mips-malta/Makefile.include b/boards/mips-malta/Makefile.include index 5ecd0137a9..943e5b9bd9 100644 --- a/boards/mips-malta/Makefile.include +++ b/boards/mips-malta/Makefile.include @@ -1,5 +1,4 @@ export CPU = mips32r2_generic -export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/ #export USE_HARD_FLOAT = 1 export USE_DSP = 1 export USE_UHI_SYSCALLS = 1 diff --git a/boards/nz32-sc151/Makefile.include b/boards/nz32-sc151/Makefile.include index 8f16c6c4d1..686810607d 100644 --- a/boards/nz32-sc151/Makefile.include +++ b/boards/nz32-sc151/Makefile.include @@ -17,7 +17,5 @@ HEXFILE = $(BINFILE) export FFLAGS = -d $(ID) -a 0 -s 0x08000000:leave -D "$(HEXFILE)" export TERMFLAGS = -p $(PORT) -export INCLUDES += -I$(RIOTCPU)/$(CPU)/include/ -I$(RIOTBOARD)/$(BOARD)/include/ - # setup serial terminal include $(RIOTMAKE)/tools/serial.inc.mk diff --git a/boards/pic32-clicker/Makefile.include b/boards/pic32-clicker/Makefile.include index 77e367b9dd..264f0e502c 100644 --- a/boards/pic32-clicker/Makefile.include +++ b/boards/pic32-clicker/Makefile.include @@ -1,5 +1,4 @@ export CPU = mips_pic32mx export CPU_MODEL=p32mx470f512h -export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/ export APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S export USE_UHI_SYSCALLS = 1 diff --git a/boards/pic32-wifire/Makefile.include b/boards/pic32-wifire/Makefile.include index 4e1049769f..7e4a7c7387 100644 --- a/boards/pic32-wifire/Makefile.include +++ b/boards/pic32-wifire/Makefile.include @@ -1,5 +1,4 @@ export CPU = mips_pic32mz export CPU_MODEL=p32mz2048efg100 -export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/ export APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S export USE_UHI_SYSCALLS = 1 diff --git a/boards/spark-core/Makefile.include b/boards/spark-core/Makefile.include index 5e1da18bbb..cd71cdea80 100644 --- a/boards/spark-core/Makefile.include +++ b/boards/spark-core/Makefile.include @@ -14,8 +14,6 @@ export RESET = # dfu-util has no support for resetting the device HEXFILE = $(BINFILE) export FFLAGS = -d 1d50:607f -a 0 -s 0x08005000:leave -D "$(HEXFILE)" -export INCLUDES += -I$(RIOTCPU)/$(CPU)/include/ -I$(RIOTBOARD)/$(BOARD)/include/ - # Skip the space needed by the embedded bootloader export ROM_OFFSET ?= 0x5000 -- GitLab