Skip to content
Snippets Groups Projects
Unverified Commit 6fc8fae2 authored by cladmi's avatar cladmi
Browse files

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.
parent e8af06fe
No related branches found
No related tags found
No related merge requests found
...@@ -5,6 +5,3 @@ ifeq ($(PROGRAMMER),jlink) ...@@ -5,6 +5,3 @@ ifeq ($(PROGRAMMER),jlink)
endif endif
include $(RIOTBOARD)/common/arduino-mkr/Makefile.include include $(RIOTBOARD)/common/arduino-mkr/Makefile.include
# add arduino-mkr1000 include path
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
...@@ -5,6 +5,3 @@ ifeq ($(PROGRAMMER),jlink) ...@@ -5,6 +5,3 @@ ifeq ($(PROGRAMMER),jlink)
endif endif
include $(RIOTBOARD)/common/arduino-mkr/Makefile.include include $(RIOTBOARD)/common/arduino-mkr/Makefile.include
# add arduino-mkrfox1200 include path
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
...@@ -5,6 +5,3 @@ ifeq ($(PROGRAMMER),jlink) ...@@ -5,6 +5,3 @@ ifeq ($(PROGRAMMER),jlink)
endif endif
include $(RIOTBOARD)/common/arduino-mkr/Makefile.include include $(RIOTBOARD)/common/arduino-mkr/Makefile.include
# add arduino-mkrzero include path
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
USEMODULE += boards_common_iotlab USEMODULE += boards_common_iotlab
include $(RIOTBOARD)/common/iotlab/Makefile.include include $(RIOTBOARD)/common/iotlab/Makefile.include
# add iotlab-a8-m3 include path
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
USEMODULE += boards_common_iotlab USEMODULE += boards_common_iotlab
include $(RIOTBOARD)/common/iotlab/Makefile.include include $(RIOTBOARD)/common/iotlab/Makefile.include
# add iotlab-m3 include path
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
export CPU = mips32r2_generic export CPU = mips32r2_generic
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/
#export USE_HARD_FLOAT = 1 #export USE_HARD_FLOAT = 1
export USE_DSP = 1 export USE_DSP = 1
export USE_UHI_SYSCALLS = 1 export USE_UHI_SYSCALLS = 1
......
...@@ -17,7 +17,5 @@ HEXFILE = $(BINFILE) ...@@ -17,7 +17,5 @@ HEXFILE = $(BINFILE)
export FFLAGS = -d $(ID) -a 0 -s 0x08000000:leave -D "$(HEXFILE)" export FFLAGS = -d $(ID) -a 0 -s 0x08000000:leave -D "$(HEXFILE)"
export TERMFLAGS = -p $(PORT) export TERMFLAGS = -p $(PORT)
export INCLUDES += -I$(RIOTCPU)/$(CPU)/include/ -I$(RIOTBOARD)/$(BOARD)/include/
# setup serial terminal # setup serial terminal
include $(RIOTMAKE)/tools/serial.inc.mk include $(RIOTMAKE)/tools/serial.inc.mk
export CPU = mips_pic32mx export CPU = mips_pic32mx
export CPU_MODEL=p32mx470f512h export CPU_MODEL=p32mx470f512h
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/
export APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S export APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S
export USE_UHI_SYSCALLS = 1 export USE_UHI_SYSCALLS = 1
export CPU = mips_pic32mz export CPU = mips_pic32mz
export CPU_MODEL=p32mz2048efg100 export CPU_MODEL=p32mz2048efg100
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/
export APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S export APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S
export USE_UHI_SYSCALLS = 1 export USE_UHI_SYSCALLS = 1
...@@ -14,8 +14,6 @@ export RESET = # dfu-util has no support for resetting the device ...@@ -14,8 +14,6 @@ export RESET = # dfu-util has no support for resetting the device
HEXFILE = $(BINFILE) HEXFILE = $(BINFILE)
export FFLAGS = -d 1d50:607f -a 0 -s 0x08005000:leave -D "$(HEXFILE)" 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 # Skip the space needed by the embedded bootloader
export ROM_OFFSET ?= 0x5000 export ROM_OFFSET ?= 0x5000
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment