Merge pull request #8058 from haukepetersen/opt_boards_usecommon
boards: move shared code to boards/common/xx
This commit is contained in:
Gaëtan Harter
GitHub
commit
da24cdaf3f
@ -1,5 +1,5 @@
|
||||
MODULE = board
|
||||
|
||||
DIRS = $(RIOTBOARD)/arduino-atmega-common
|
||||
DIRS = $(RIOTBOARD)/common/arduino-atmega
|
||||
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
include $(RIOTBOARD)/arduino-atmega-common/Makefile.features
|
||||
include $(RIOTBOARD)/common/arduino-atmega/Makefile.features
|
||||
|
||||
-include $(RIOTCPU)/atmega328p/Makefile.features
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# define the cpu used by the ardudino duemilanove board
|
||||
export CPU = atmega328p
|
||||
|
||||
USEMODULE += arduino-atmega-common
|
||||
USEMODULE += boards_common_arduino-atmega
|
||||
|
||||
#export needed for flash rule
|
||||
export PORT_LINUX ?= /dev/ttyUSB0
|
||||
@ -14,4 +14,4 @@ export FFLAGS += -p m328p
|
||||
# overridden for debugging (which requires changes that require to use an ISP)
|
||||
export PROGRAMMER ?= arduino
|
||||
|
||||
include $(RIOTBOARD)/arduino-atmega-common/Makefile.include
|
||||
include $(RIOTBOARD)/common/arduino-atmega/Makefile.include
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MODULE = board
|
||||
|
||||
DIRS = $(RIOTBOARD)/arduino-atmega-common
|
||||
DIRS = $(RIOTBOARD)/common/arduino-atmega
|
||||
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
include $(RIOTBOARD)/arduino-atmega-common/Makefile.features
|
||||
include $(RIOTBOARD)/common/arduino-atmega/Makefile.features
|
||||
|
||||
-include $(RIOTCPU)/atmega2560/Makefile.features
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# define the cpu used by the arduino mega2560 board
|
||||
export CPU = atmega2560
|
||||
|
||||
USEMODULE += arduino-atmega-common
|
||||
USEMODULE += boards_common_arduino-atmega
|
||||
|
||||
#export needed for flash rule
|
||||
export PORT_LINUX ?= /dev/ttyACM0
|
||||
@ -14,4 +14,4 @@ export FFLAGS += -p m2560
|
||||
# overridden for debugging (which requires changes that require to use an ISP)
|
||||
export PROGRAMMER ?= stk500v2
|
||||
|
||||
include $(RIOTBOARD)/arduino-atmega-common/Makefile.include
|
||||
include $(RIOTBOARD)/common/arduino-atmega/Makefile.include
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MODULE = board
|
||||
|
||||
DIRS = $(RIOTBOARD)/arduino-mkr-common
|
||||
DIRS = $(RIOTBOARD)/common/arduino-mkr
|
||||
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
@ -1 +1 @@
|
||||
include $(RIOTBOARD)/arduino-mkr-common/Makefile.dep
|
||||
include $(RIOTBOARD)/common/arduino-mkr/Makefile.dep
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
include $(RIOTBOARD)/arduino-mkr-common/Makefile.features
|
||||
include $(RIOTBOARD)/common/arduino-mkr/Makefile.features
|
||||
|
||||
-include $(RIOTCPU)/samd21/Makefile.features
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
USEMODULE += arduino-mkr-common
|
||||
USEMODULE += boards_common_arduino-mkr
|
||||
|
||||
ifeq ($(PROGRAMMER),jlink)
|
||||
export MKR_JLINK_DEVICE = atsamw25
|
||||
endif
|
||||
|
||||
include $(RIOTBOARD)/arduino-mkr-common/Makefile.include
|
||||
include $(RIOTBOARD)/common/arduino-mkr/Makefile.include
|
||||
|
||||
# add arduino-mkr1000 include path
|
||||
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MODULE = board
|
||||
|
||||
DIRS = $(RIOTBOARD)/arduino-mkr-common
|
||||
DIRS = $(RIOTBOARD)/common/arduino-mkr
|
||||
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
@ -1 +1 @@
|
||||
include $(RIOTBOARD)/arduino-mkr-common/Makefile.dep
|
||||
include $(RIOTBOARD)/common/arduino-mkr/Makefile.dep
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
include $(RIOTBOARD)/arduino-mkr-common/Makefile.features
|
||||
include $(RIOTBOARD)/common/arduino-mkr/Makefile.features
|
||||
|
||||
-include $(RIOTCPU)/samd21/Makefile.features
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
USEMODULE += arduino-mkr-common
|
||||
USEMODULE += boards_common_arduino-mkr
|
||||
|
||||
ifeq ($(PROGRAMMER),jlink)
|
||||
export MKR_JLINK_DEVICE = atsamd21
|
||||
endif
|
||||
|
||||
include $(RIOTBOARD)/arduino-mkr-common/Makefile.include
|
||||
include $(RIOTBOARD)/common/arduino-mkr/Makefile.include
|
||||
|
||||
# add arduino-mkrzero include path
|
||||
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MODULE = board
|
||||
|
||||
DIRS = $(RIOTBOARD)/arduino-atmega-common
|
||||
DIRS = $(RIOTBOARD)/common/arduino-atmega
|
||||
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
include $(RIOTBOARD)/arduino-atmega-common/Makefile.features
|
||||
include $(RIOTBOARD)/common/arduino-atmega/Makefile.features
|
||||
|
||||
-include $(RIOTCPU)/atmega328p/Makefile.features
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# define the cpu used by the arduino uno board
|
||||
export CPU = atmega328p
|
||||
|
||||
USEMODULE += arduino-atmega-common
|
||||
USEMODULE += boards_common_arduino-atmega
|
||||
|
||||
# export needed for flash rule
|
||||
export PORT_LINUX ?= /dev/ttyACM0
|
||||
@ -14,4 +14,4 @@ export FFLAGS += -p m328p
|
||||
# overridden for debugging (which requires changes that require to use an ISP)
|
||||
export PROGRAMMER ?= arduino
|
||||
|
||||
include $(RIOTBOARD)/arduino-atmega-common/Makefile.include
|
||||
include $(RIOTBOARD)/common/arduino-atmega/Makefile.include
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MODULE = board
|
||||
|
||||
DIRS = $(RIOTBOARD)/msba2-common
|
||||
DIRS = $(RIOTBOARD)/common/msba2
|
||||
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
@ -1 +1 @@
|
||||
include $(RIOTBOARD)/msba2-common/Makefile.dep
|
||||
include $(RIOTBOARD)/common/msba2/Makefile.dep
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
USEMODULE += msba2-common
|
||||
USEMODULE += boards_common_msba2
|
||||
|
||||
include $(RIOTBOARD)/msba2-common/Makefile.include
|
||||
include $(RIOTBOARD)/common/msba2/Makefile.include
|
||||
|
||||
3
boards/common/arduino-atmega/Makefile
Normal file
3
boards/common/arduino-atmega/Makefile
Normal file
@ -0,0 +1,3 @@
|
||||
MODULE = boards_common_arduino-atmega
|
||||
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
@ -1,7 +1,7 @@
|
||||
# include optional dependencies
|
||||
include $(RIOTBOARD)/arduino-atmega-common/Makefile.dep
|
||||
include $(RIOTBOARD)/common/arduino-atmega/Makefile.dep
|
||||
|
||||
INCLUDES += -I$(RIOTBOARD)/arduino-atmega-common/include
|
||||
INCLUDES += -I$(RIOTBOARD)/common/arduino-atmega/include
|
||||
|
||||
# refine serial port information
|
||||
export BAUD ?= 9600
|
||||
@ -1,3 +1,3 @@
|
||||
MODULE = arduino-atmega-common
|
||||
MODULE = boards_common_arduino-mkr
|
||||
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
@ -22,7 +22,7 @@ else
|
||||
include $(RIOTMAKE)/tools/bossa.inc.mk
|
||||
endif
|
||||
|
||||
INCLUDES += -I$(RIOTBOARD)/arduino-mkr-common/include
|
||||
INCLUDES += -I$(RIOTBOARD)/common/arduino-mkr/include
|
||||
|
||||
# setup the boards dependencies
|
||||
include $(RIOTBOARD)/$(BOARD)/Makefile.dep
|
||||
@ -29,11 +29,11 @@ flash: $(RIOTCPU)/$(CPU)/dist/wdog-disable.bin
|
||||
# Reset the default goal.
|
||||
.DEFAULT_GOAL :=
|
||||
|
||||
export OPENOCD_CONFIG ?= $(RIOTBOARD)/frdm-common/dist/old-openocd-$(CPU_FAMILY).cfg
|
||||
export OPENOCD_CONFIG ?= $(RIOTBOARD)/common/frdm/dist/old-openocd-$(CPU_FAMILY).cfg
|
||||
endif
|
||||
|
||||
# Configuration for OpenOCD v0.10.0 and newer
|
||||
export OPENOCD_CONFIG ?= $(RIOTBOARD)/frdm-common/dist/openocd-$(CPU_FAMILY).cfg
|
||||
export OPENOCD_CONFIG ?= $(RIOTBOARD)/common/frdm/dist/openocd-$(CPU_FAMILY).cfg
|
||||
|
||||
# Check the flash configuration field before flashing
|
||||
export PRE_FLASH_CHECK_SCRIPT = $(RIOTCPU)/$(CPU)/dist/check-fcfield-elf.sh
|
||||
@ -1,3 +1,3 @@
|
||||
MODULE = remote-common
|
||||
MODULE = boards_common_iotlab
|
||||
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
@ -14,4 +14,4 @@ include $(RIOTMAKE)/tools/serial.inc.mk
|
||||
include $(RIOTMAKE)/tools/openocd.inc.mk
|
||||
|
||||
# add the common header files to the include path
|
||||
INCLUDES += -I$(RIOTBOARD)/iotlab-common/include
|
||||
INCLUDES += -I$(RIOTBOARD)/common/iotlab/include
|
||||
@ -1,4 +1,4 @@
|
||||
MODULE = msb-430-common
|
||||
MODULE = boards_common_msb-430
|
||||
|
||||
DIRS = drivers
|
||||
|
||||
@ -24,8 +24,8 @@ export DEBUGSERVER_FLAGS = $(MSPDEBUGFLAGS) gdb
|
||||
export DEBUGGER = $(PREFIX)gdb
|
||||
export DEBUGGER_FLAGS = --tui --ex="target remote localhost:2000" --ex "monitor reset halt" --ex load -ex "monitor reset halt" $(ELFFILE)
|
||||
|
||||
# export msb-430-common includes
|
||||
export INCLUDES += -I$(RIOTBOARD)/msb-430-common/include
|
||||
export INCLUDES += -I$(RIOTBOARD)/msb-430-common/drivers/include
|
||||
# export common msb-430 includes
|
||||
export INCLUDES += -I$(RIOTBOARD)/common/msb-430/include
|
||||
export INCLUDES += -I$(RIOTBOARD)/common/msb-430/drivers/include
|
||||
|
||||
USEMODULE += msb-430-common-drivers
|
||||
USEMODULE += boards_common_msb-430-drivers
|
||||
@ -1,4 +1,4 @@
|
||||
MODULE = msb-430-common-drivers
|
||||
MODULE = boards_common_msb-430-drivers
|
||||
|
||||
include $(RIOTBOARD)/$(BOARD)/Makefile.include
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MODULE = msba2-common
|
||||
MODULE = boards_common_msba2
|
||||
|
||||
DIRS = drivers
|
||||
|
||||
@ -26,10 +26,11 @@ ifeq ($(PORT),)
|
||||
endif
|
||||
export FFLAGS = $(PORT) $(HEXFILE)
|
||||
|
||||
export INCLUDES += -I$(RIOTBOARD)/msba2-common/include -I$(RIOTBOARD)/msba2-common/drivers/include
|
||||
INCLUDES += -I$(RIOTBOARD)/common/msba2/include
|
||||
INCLUDES += -I$(RIOTBOARD)/common/msba2/drivers/include
|
||||
|
||||
export OFLAGS = -O ihex
|
||||
|
||||
export UNDEF += $(BINDIR)/cpu/startup.o
|
||||
|
||||
USEMODULE += msba2-common-drivers
|
||||
USEMODULE += boards_common_msba2-drivers
|
||||
3
boards/common/msba2/drivers/Makefile
Normal file
3
boards/common/msba2/drivers/Makefile
Normal file
@ -0,0 +1,3 @@
|
||||
MODULE = boards_common_msba2-drivers
|
||||
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user