riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8058 from haukepetersen/opt_boards_usecommon

Browse Source 
boards: move shared code to boards/common/xx
This commit is contained in:
Gaëtan Harter 2017-11-30 10:54:16 +01:00 committed by GitHub
commit da24cdaf3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
283 changed files with 213 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/arduino-duemilanove/Makefile
View File

@ -1,5 +1,5 @@
MODULE = board MODULE = board
DIRS = $(RIOTBOARD)/arduino-atmega-common DIRS = $(RIOTBOARD)/common/arduino-atmega
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
boards/arduino-duemilanove/Makefile.features
View File

@ -1,3 +1,3 @@
include $(RIOTBOARD)/arduino-atmega-common/Makefile.features include $(RIOTBOARD)/common/arduino-atmega/Makefile.features
-include $(RIOTCPU)/atmega328p/Makefile.features -include $(RIOTCPU)/atmega328p/Makefile.features

4
boards/arduino-duemilanove/Makefile.include
View File

@ -1,7 +1,7 @@
# define the cpu used by the ardudino duemilanove board # define the cpu used by the ardudino duemilanove board
export CPU = atmega328p export CPU = atmega328p
USEMODULE += arduino-atmega-common USEMODULE += boards_common_arduino-atmega
#export needed for flash rule #export needed for flash rule
export PORT_LINUX ?= /dev/ttyUSB0 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) # overridden for debugging (which requires changes that require to use an ISP)
export PROGRAMMER ?= arduino export PROGRAMMER ?= arduino
include $(RIOTBOARD)/arduino-atmega-common/Makefile.include include $(RIOTBOARD)/common/arduino-atmega/Makefile.include

2
boards/arduino-mega2560/Makefile
View File

@ -1,5 +1,5 @@
MODULE = board MODULE = board
DIRS = $(RIOTBOARD)/arduino-atmega-common DIRS = $(RIOTBOARD)/common/arduino-atmega
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
boards/arduino-mega2560/Makefile.features
View File

@ -1,3 +1,3 @@
include $(RIOTBOARD)/arduino-atmega-common/Makefile.features include $(RIOTBOARD)/common/arduino-atmega/Makefile.features
-include $(RIOTCPU)/atmega2560/Makefile.features -include $(RIOTCPU)/atmega2560/Makefile.features

4
boards/arduino-mega2560/Makefile.include
View File

@ -1,7 +1,7 @@
# define the cpu used by the arduino mega2560 board # define the cpu used by the arduino mega2560 board
export CPU = atmega2560 export CPU = atmega2560
USEMODULE += arduino-atmega-common USEMODULE += boards_common_arduino-atmega
#export needed for flash rule #export needed for flash rule
export PORT_LINUX ?= /dev/ttyACM0 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) # overridden for debugging (which requires changes that require to use an ISP)
export PROGRAMMER ?= stk500v2 export PROGRAMMER ?= stk500v2
include $(RIOTBOARD)/arduino-atmega-common/Makefile.include include $(RIOTBOARD)/common/arduino-atmega/Makefile.include

2
boards/arduino-mkr1000/Makefile
View File

@ -1,5 +1,5 @@
MODULE = board MODULE = board
DIRS = $(RIOTBOARD)/arduino-mkr-common DIRS = $(RIOTBOARD)/common/arduino-mkr
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
boards/arduino-mkr1000/Makefile.dep
View File

@ -1 +1 @@
include $(RIOTBOARD)/arduino-mkr-common/Makefile.dep include $(RIOTBOARD)/common/arduino-mkr/Makefile.dep

2
boards/arduino-mkr1000/Makefile.features
View File

@ -1,3 +1,3 @@
include $(RIOTBOARD)/arduino-mkr-common/Makefile.features include $(RIOTBOARD)/common/arduino-mkr/Makefile.features
-include $(RIOTCPU)/samd21/Makefile.features -include $(RIOTCPU)/samd21/Makefile.features

4
boards/arduino-mkr1000/Makefile.include
View File

@ -1,10 +1,10 @@
USEMODULE += arduino-mkr-common USEMODULE += boards_common_arduino-mkr
ifeq ($(PROGRAMMER),jlink) ifeq ($(PROGRAMMER),jlink)
export MKR_JLINK_DEVICE = atsamw25 export MKR_JLINK_DEVICE = atsamw25
endif endif
include $(RIOTBOARD)/arduino-mkr-common/Makefile.include include $(RIOTBOARD)/common/arduino-mkr/Makefile.include
# add arduino-mkr1000 include path # add arduino-mkr1000 include path
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

2
boards/arduino-mkrzero/Makefile
View File

@ -1,5 +1,5 @@
MODULE = board MODULE = board
DIRS = $(RIOTBOARD)/arduino-mkr-common DIRS = $(RIOTBOARD)/common/arduino-mkr
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
boards/arduino-mkrzero/Makefile.dep
View File

@ -1 +1 @@
include $(RIOTBOARD)/arduino-mkr-common/Makefile.dep include $(RIOTBOARD)/common/arduino-mkr/Makefile.dep

2
boards/arduino-mkrzero/Makefile.features
View File

@ -1,3 +1,3 @@
include $(RIOTBOARD)/arduino-mkr-common/Makefile.features include $(RIOTBOARD)/common/arduino-mkr/Makefile.features
-include $(RIOTCPU)/samd21/Makefile.features -include $(RIOTCPU)/samd21/Makefile.features

4
boards/arduino-mkrzero/Makefile.include
View File

@ -1,10 +1,10 @@
USEMODULE += arduino-mkr-common USEMODULE += boards_common_arduino-mkr
ifeq ($(PROGRAMMER),jlink) ifeq ($(PROGRAMMER),jlink)
export MKR_JLINK_DEVICE = atsamd21 export MKR_JLINK_DEVICE = atsamd21
endif endif
include $(RIOTBOARD)/arduino-mkr-common/Makefile.include include $(RIOTBOARD)/common/arduino-mkr/Makefile.include
# add arduino-mkrzero include path # add arduino-mkrzero include path
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

2
boards/arduino-uno/Makefile
View File

@ -1,5 +1,5 @@
MODULE = board MODULE = board
DIRS = $(RIOTBOARD)/arduino-atmega-common DIRS = $(RIOTBOARD)/common/arduino-atmega
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
boards/arduino-uno/Makefile.features
View File

@ -1,3 +1,3 @@
include $(RIOTBOARD)/arduino-atmega-common/Makefile.features include $(RIOTBOARD)/common/arduino-atmega/Makefile.features
-include $(RIOTCPU)/atmega328p/Makefile.features -include $(RIOTCPU)/atmega328p/Makefile.features

4
boards/arduino-uno/Makefile.include
View File

@ -1,7 +1,7 @@
# define the cpu used by the arduino uno board # define the cpu used by the arduino uno board
export CPU = atmega328p export CPU = atmega328p
USEMODULE += arduino-atmega-common USEMODULE += boards_common_arduino-atmega
# export needed for flash rule # export needed for flash rule
export PORT_LINUX ?= /dev/ttyACM0 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) # overridden for debugging (which requires changes that require to use an ISP)
export PROGRAMMER ?= arduino export PROGRAMMER ?= arduino
include $(RIOTBOARD)/arduino-atmega-common/Makefile.include include $(RIOTBOARD)/common/arduino-atmega/Makefile.include

2
boards/avsextrem/Makefile
View File

@ -1,5 +1,5 @@
MODULE = board MODULE = board
DIRS = $(RIOTBOARD)/msba2-common DIRS = $(RIOTBOARD)/common/msba2
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
boards/avsextrem/Makefile.dep
View File

@ -1 +1 @@
include $(RIOTBOARD)/msba2-common/Makefile.dep include $(RIOTBOARD)/common/msba2/Makefile.dep

4
boards/avsextrem/Makefile.include
View File

@ -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
View File

@ -0,0 +1,3 @@
MODULE = boards_common_arduino-atmega
include $(RIOTBASE)/Makefile.base

0
boards/arduino-atmega-common/Makefile.dep → boards/common/arduino-atmega/Makefile.dep
View File

0
boards/arduino-atmega-common/Makefile.features → boards/common/arduino-atmega/Makefile.features
View File

4
boards/arduino-atmega-common/Makefile.include → boards/common/arduino-atmega/Makefile.include
View File

@ -1,7 +1,7 @@
# include optional dependencies # 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 # refine serial port information
export BAUD ?= 9600 export BAUD ?= 9600

0
boards/arduino-atmega-common/board.c → boards/common/arduino-atmega/board.c
View File

0
boards/arduino-atmega-common/dist/debug.sh → boards/common/arduino-atmega/dist/debug.sh vendored
View File

0
boards/arduino-atmega-common/dist/debug_srv.sh → boards/common/arduino-atmega/dist/debug_srv.sh vendored
View File

0
boards/arduino-atmega-common/dist/gdb.conf → boards/common/arduino-atmega/dist/gdb.conf vendored
View File

0
boards/arduino-atmega-common/doc.txt → boards/common/arduino-atmega/doc.txt
View File

0
boards/arduino-atmega-common/include/arduino_board.h → boards/common/arduino-atmega/include/arduino_board.h
View File

0
boards/arduino-atmega-common/include/arduino_pinmap.h → boards/common/arduino-atmega/include/arduino_pinmap.h
View File

0
boards/arduino-atmega-common/include/board_common.h → boards/common/arduino-atmega/include/board_common.h
View File

0
boards/arduino-atmega-common/include/gpio_params.h → boards/common/arduino-atmega/include/gpio_params.h
View File

0
boards/arduino-atmega-common/include/periph_conf.h → boards/common/arduino-atmega/include/periph_conf.h
View File

2
boards/arduino-atmega-common/Makefile → boards/common/arduino-mkr/Makefile
View File

@ -1,3 +1,3 @@
MODULE = arduino-atmega-common MODULE = boards_common_arduino-mkr
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

0
boards/arduino-mkr-common/Makefile.dep → boards/common/arduino-mkr/Makefile.dep
View File

0
boards/arduino-mkr-common/Makefile.features → boards/common/arduino-mkr/Makefile.features
View File

2
boards/arduino-mkr-common/Makefile.include → boards/common/arduino-mkr/Makefile.include
View File

@ -22,7 +22,7 @@ else
include $(RIOTMAKE)/tools/bossa.inc.mk include $(RIOTMAKE)/tools/bossa.inc.mk
endif endif
INCLUDES += -I$(RIOTBOARD)/arduino-mkr-common/include INCLUDES += -I$(RIOTBOARD)/common/arduino-mkr/include
# setup the boards dependencies # setup the boards dependencies
include $(RIOTBOARD)/$(BOARD)/Makefile.dep include $(RIOTBOARD)/$(BOARD)/Makefile.dep

0
boards/arduino-mkr-common/board.c → boards/common/arduino-mkr/board.c
View File

0
boards/arduino-mkr-common/include/arduino_board.h → boards/common/arduino-mkr/include/arduino_board.h
View File

0
boards/arduino-mkr-common/include/arduino_pinmap.h → boards/common/arduino-mkr/include/arduino_pinmap.h
View File

0
boards/arduino-mkr-common/include/board_common.h → boards/common/arduino-mkr/include/board_common.h
View File

0
boards/arduino-mkr-common/include/gpio_params.h → boards/common/arduino-mkr/include/gpio_params.h
View File

0
boards/arduino-mkr-common/include/periph_conf.h → boards/common/arduino-mkr/include/periph_conf.h
View File

4
boards/frdm-common/Makefile.include → boards/common/frdm/Makefile.include
View File

@ -29,11 +29,11 @@ flash: $(RIOTCPU)/$(CPU)/dist/wdog-disable.bin
# Reset the default goal. # Reset the default goal.
.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 endif
# Configuration for OpenOCD v0.10.0 and newer # 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 # Check the flash configuration field before flashing
export PRE_FLASH_CHECK_SCRIPT = $(RIOTCPU)/$(CPU)/dist/check-fcfield-elf.sh export PRE_FLASH_CHECK_SCRIPT = $(RIOTCPU)/$(CPU)/dist/check-fcfield-elf.sh

0
boards/frdm-common/dist/old-openocd-kx.cfg → boards/common/frdm/dist/old-openocd-kx.cfg vendored
View File

0
boards/frdm-common/dist/openocd-kx.cfg → boards/common/frdm/dist/openocd-kx.cfg vendored
View File

2
boards/remote-common/Makefile → boards/common/iotlab/Makefile
View File

@ -1,3 +1,3 @@
MODULE = remote-common MODULE = boards_common_iotlab
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

0
boards/iotlab-common/Makefile.dep → boards/common/iotlab/Makefile.dep
View File

0
boards/iotlab-common/Makefile.features → boards/common/iotlab/Makefile.features
View File

2
boards/iotlab-common/Makefile.include → boards/common/iotlab/Makefile.include
View File

@ -14,4 +14,4 @@ include $(RIOTMAKE)/tools/serial.inc.mk
include $(RIOTMAKE)/tools/openocd.inc.mk include $(RIOTMAKE)/tools/openocd.inc.mk
# add the common header files to the include path # add the common header files to the include path
INCLUDES += -I$(RIOTBOARD)/iotlab-common/include INCLUDES += -I$(RIOTBOARD)/common/iotlab/include

0
boards/iotlab-common/board_init.c → boards/common/iotlab/board_init.c
View File

0
boards/iotlab-common/include/board_common.h → boards/common/iotlab/include/board_common.h
View File

0
boards/iotlab-common/include/gpio_params.h → boards/common/iotlab/include/gpio_params.h
View File

0
boards/iotlab-common/include/l3g4200d_params.h → boards/common/iotlab/include/l3g4200d_params.h
View File

0
boards/iotlab-common/include/lsm303dlhc_params.h → boards/common/iotlab/include/lsm303dlhc_params.h
View File

0
boards/iotlab-common/include/periph_conf_common.h → boards/common/iotlab/include/periph_conf_common.h
View File

2
boards/msb-430-common/Makefile → boards/common/msb-430/Makefile
View File

@ -1,4 +1,4 @@
MODULE = msb-430-common MODULE = boards_common_msb-430
DIRS = drivers DIRS = drivers

0
boards/msb-430-common/Makefile.features → boards/common/msb-430/Makefile.features
View File

8
boards/msb-430-common/Makefile.include → boards/common/msb-430/Makefile.include
View File

@ -24,8 +24,8 @@ export DEBUGSERVER_FLAGS = $(MSPDEBUGFLAGS) gdb
export DEBUGGER = $(PREFIX)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 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 common msb-430 includes
export INCLUDES += -I$(RIOTBOARD)/msb-430-common/include export INCLUDES += -I$(RIOTBOARD)/common/msb-430/include
export INCLUDES += -I$(RIOTBOARD)/msb-430-common/drivers/include export INCLUDES += -I$(RIOTBOARD)/common/msb-430/drivers/include
USEMODULE += msb-430-common-drivers USEMODULE += boards_common_msb-430-drivers

0
boards/msb-430-common/board_init.c → boards/common/msb-430/board_init.c
View File

2
boards/msb-430-common/drivers/Makefile → boards/common/msb-430/drivers/Makefile
View File

@ -1,4 +1,4 @@
MODULE = msb-430-common-drivers MODULE = boards_common_msb-430-drivers
include $(RIOTBOARD)/$(BOARD)/Makefile.include include $(RIOTBOARD)/$(BOARD)/Makefile.include

0
boards/msb-430-common/drivers/include/sht11-board.h → boards/common/msb-430/drivers/include/sht11-board.h
View File

0
boards/msb-430-common/include/board_common.h → boards/common/msb-430/include/board_common.h
View File

2
boards/msba2-common/Makefile → boards/common/msba2/Makefile
View File

@ -1,4 +1,4 @@
MODULE = msba2-common MODULE = boards_common_msba2
DIRS = drivers DIRS = drivers

0
boards/msba2-common/Makefile.dep → boards/common/msba2/Makefile.dep
View File

5
boards/msba2-common/Makefile.include → boards/common/msba2/Makefile.include
View File

@ -26,10 +26,11 @@ ifeq ($(PORT),)
endif endif
export FFLAGS = $(PORT) $(HEXFILE) 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 OFLAGS = -O ihex
export UNDEF += $(BINDIR)/cpu/startup.o export UNDEF += $(BINDIR)/cpu/startup.o
USEMODULE += msba2-common-drivers USEMODULE += boards_common_msba2-drivers

0
boards/msba2-common/board_common_init.c → boards/common/msba2/board_common_init.c
View File

3
boards/common/msba2/drivers/Makefile Normal file
View File

@ -0,0 +1,3 @@
MODULE = boards_common_msba2-drivers
include $(RIOTBASE)/Makefile.base

0
boards/msba2-common/drivers/include/sht11-board.h → boards/common/msba2/drivers/include/sht11-board.h
View File

0
boards/msba2-common/include/msba2_common.h → boards/common/msba2/include/msba2_common.h
View File

0
boards/msba2-common/tools/CHANGES → boards/common/msba2/tools/CHANGES
View File

0
boards/msba2-common/tools/COPYING → boards/common/msba2/tools/COPYING
View File

0
boards/msba2-common/tools/Makefile → boards/common/msba2/tools/Makefile
View File

0
boards/msba2-common/tools/README.txt → boards/common/msba2/tools/README.txt
View File

0
boards/msba2-common/tools/armtools.txt → boards/common/msba2/tools/armtools.txt
View File

0
boards/msba2-common/tools/flash.cmd → boards/common/msba2/tools/flash.cmd
View File

0
boards/msba2-common/tools/flashutil.sh → boards/common/msba2/tools/flashutil.sh
View File

0
boards/msba2-common/tools/mkbootc → boards/common/msba2/tools/mkbootc
View File

0
boards/msba2-common/tools/mkstaticlist → boards/common/msba2/tools/mkstaticlist
View File

0
boards/msba2-common/tools/obj/.gitignore → boards/common/msba2/tools/obj/.gitignore vendored
View File

0
boards/msba2-common/tools/src/boot.h → boards/common/msba2/tools/src/boot.h
View File

0
boards/msba2-common/tools/src/boot_23xx.armasm → boards/common/msba2/tools/src/boot_23xx.armasm
View File

0
boards/msba2-common/tools/src/boot_23xx.c → boards/common/msba2/tools/src/boot_23xx.c
View File

0
boards/msba2-common/tools/src/boot_23xx.h → boards/common/msba2/tools/src/boot_23xx.h
View File

0
boards/msba2-common/tools/src/boot_2xxx.armasm → boards/common/msba2/tools/src/boot_2xxx.armasm
View File

0
boards/msba2-common/tools/src/boot_2xxx.c → boards/common/msba2/tools/src/boot_2xxx.c
View File

0
boards/msba2-common/tools/src/boot_2xxx.h → boards/common/msba2/tools/src/boot_2xxx.h
View File

0
boards/msba2-common/tools/src/chipinfo.c → boards/common/msba2/tools/src/chipinfo.c
View File

0
boards/msba2-common/tools/src/chipinfo.h → boards/common/msba2/tools/src/chipinfo.h
View File

0
boards/msba2-common/tools/src/cksum_test.c → boards/common/msba2/tools/src/cksum_test.c
View File

0
boards/msba2-common/tools/src/control_2xxx.c → boards/common/msba2/tools/src/control_2xxx.c
View File

0
boards/msba2-common/tools/src/control_2xxx.h → boards/common/msba2/tools/src/control_2xxx.h
View File

0
boards/msba2-common/tools/src/download.c → boards/common/msba2/tools/src/download.c
View File

0
boards/msba2-common/tools/src/download.h → boards/common/msba2/tools/src/download.h
View File

0
boards/msba2-common/tools/src/gui.c → boards/common/msba2/tools/src/gui.c
View File

0
boards/msba2-common/tools/src/gui.h → boards/common/msba2/tools/src/gui.h
View File

0
boards/msba2-common/tools/src/ihex.c → boards/common/msba2/tools/src/ihex.c
View File

0
boards/msba2-common/tools/src/ihex.h → boards/common/msba2/tools/src/ihex.h
View File

0
boards/msba2-common/tools/src/lpc2k_pgm.c → boards/common/msba2/tools/src/lpc2k_pgm.c
View File

Some files were not shown because too many files have changed in this diff Show More