Skip to content

Commit

Permalink
Merge pull request #8058 from haukepetersen/opt_boards_usecommon
Browse files Browse the repository at this point in the history 
boards: move shared code to boards/common/xx
  • Loading branch information
@cladmi
cladmi authored Nov 30, 2017
2 parents 5f5cdd1 + a1d5e0f commit da24cda
Show file tree
Hide file tree
Showing 283 changed files with 213 additions and 212 deletions.
2 changes: 1 addition & 1 deletion boards/arduino-duemilanove/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MODULE = board

DIRS = $(RIOTBOARD)/arduino-atmega-common
DIRS = $(RIOTBOARD)/common/arduino-atmega

include $(RIOTBASE)/Makefile.base
2 changes: 1 addition & 1 deletion boards/arduino-duemilanove/Makefile.features
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include $(RIOTBOARD)/arduino-atmega-common/Makefile.features
include $(RIOTBOARD)/common/arduino-atmega/Makefile.features

-include $(RIOTCPU)/atmega328p/Makefile.features
4 changes: 2 additions & 2 deletions boards/arduino-duemilanove/Makefile.include
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion boards/arduino-mega2560/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MODULE = board

DIRS = $(RIOTBOARD)/arduino-atmega-common
DIRS = $(RIOTBOARD)/common/arduino-atmega

include $(RIOTBASE)/Makefile.base
2 changes: 1 addition & 1 deletion boards/arduino-mega2560/Makefile.features
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include $(RIOTBOARD)/arduino-atmega-common/Makefile.features
include $(RIOTBOARD)/common/arduino-atmega/Makefile.features

-include $(RIOTCPU)/atmega2560/Makefile.features
4 changes: 2 additions & 2 deletions boards/arduino-mega2560/Makefile.include
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion boards/arduino-mkr1000/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MODULE = board

DIRS = $(RIOTBOARD)/arduino-mkr-common
DIRS = $(RIOTBOARD)/common/arduino-mkr

include $(RIOTBASE)/Makefile.base
2 changes: 1 addition & 1 deletion boards/arduino-mkr1000/Makefile.dep
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include $(RIOTBOARD)/arduino-mkr-common/Makefile.dep
include $(RIOTBOARD)/common/arduino-mkr/Makefile.dep
2 changes: 1 addition & 1 deletion boards/arduino-mkr1000/Makefile.features
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include $(RIOTBOARD)/arduino-mkr-common/Makefile.features
include $(RIOTBOARD)/common/arduino-mkr/Makefile.features

-include $(RIOTCPU)/samd21/Makefile.features
4 changes: 2 additions & 2 deletions boards/arduino-mkr1000/Makefile.include
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion boards/arduino-mkrzero/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MODULE = board

DIRS = $(RIOTBOARD)/arduino-mkr-common
DIRS = $(RIOTBOARD)/common/arduino-mkr

include $(RIOTBASE)/Makefile.base
2 changes: 1 addition & 1 deletion boards/arduino-mkrzero/Makefile.dep
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include $(RIOTBOARD)/arduino-mkr-common/Makefile.dep
include $(RIOTBOARD)/common/arduino-mkr/Makefile.dep
2 changes: 1 addition & 1 deletion boards/arduino-mkrzero/Makefile.features
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include $(RIOTBOARD)/arduino-mkr-common/Makefile.features
include $(RIOTBOARD)/common/arduino-mkr/Makefile.features

-include $(RIOTCPU)/samd21/Makefile.features
4 changes: 2 additions & 2 deletions boards/arduino-mkrzero/Makefile.include
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion boards/arduino-uno/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MODULE = board

DIRS = $(RIOTBOARD)/arduino-atmega-common
DIRS = $(RIOTBOARD)/common/arduino-atmega

include $(RIOTBASE)/Makefile.base
2 changes: 1 addition & 1 deletion boards/arduino-uno/Makefile.features
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include $(RIOTBOARD)/arduino-atmega-common/Makefile.features
include $(RIOTBOARD)/common/arduino-atmega/Makefile.features

-include $(RIOTCPU)/atmega328p/Makefile.features
4 changes: 2 additions & 2 deletions boards/arduino-uno/Makefile.include
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion boards/avsextrem/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MODULE = board

DIRS = $(RIOTBOARD)/msba2-common
DIRS = $(RIOTBOARD)/common/msba2

include $(RIOTBASE)/Makefile.base
2 changes: 1 addition & 1 deletion boards/avsextrem/Makefile.dep
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include $(RIOTBOARD)/msba2-common/Makefile.dep
include $(RIOTBOARD)/common/msba2/Makefile.dep
4 changes: 2 additions & 2 deletions boards/avsextrem/Makefile.include
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
USEMODULE += msba2-common
USEMODULE += boards_common_msba2

include $(RIOTBOARD)/msba2-common/Makefile.include
include $(RIOTBOARD)/common/msba2/Makefile.include
3 changes: 3 additions & 0 deletions boards/common/arduino-atmega/Makefile
View file
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
0 ...s/arduino-atmega-common/Makefile.features → ...s/common/arduino-atmega/Makefile.features
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ds/arduino-atmega-common/Makefile.include → ...ds/common/arduino-atmega/Makefile.include
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 boards/arduino-atmega-common/board.c → boards/common/arduino-atmega/board.c
View file
File renamed without changes.
0 boards/arduino-atmega-common/dist/debug.sh → boards/common/arduino-atmega/dist/debug.sh
View file
File renamed without changes.
0 ...s/arduino-atmega-common/dist/debug_srv.sh → ...s/common/arduino-atmega/dist/debug_srv.sh
View file
File renamed without changes.
0 boards/arduino-atmega-common/dist/gdb.conf → boards/common/arduino-atmega/dist/gdb.conf
View file
File renamed without changes.
0 boards/arduino-atmega-common/doc.txt → boards/common/arduino-atmega/doc.txt
View file
File renamed without changes.
0 ...ino-atmega-common/include/arduino_board.h → ...on/arduino-atmega/include/arduino_board.h
View file
File renamed without changes.
0 ...no-atmega-common/include/arduino_pinmap.h → ...n/arduino-atmega/include/arduino_pinmap.h
View file
File renamed without changes.
0 ...uino-atmega-common/include/board_common.h → ...mon/arduino-atmega/include/board_common.h
View file
File renamed without changes.
0 ...duino-atmega-common/include/gpio_params.h → ...mmon/arduino-atmega/include/gpio_params.h
View file
File renamed without changes.
0 ...duino-atmega-common/include/periph_conf.h → ...mmon/arduino-atmega/include/periph_conf.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion boards/arduino-atmega-common/Makefile → boards/common/arduino-mkr/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
MODULE = arduino-atmega-common
MODULE = boards_common_arduino-mkr

include $(RIOTBASE)/Makefile.base
0 boards/arduino-mkr-common/Makefile.dep → boards/common/arduino-mkr/Makefile.dep
View file
File renamed without changes.
0 boards/arduino-mkr-common/Makefile.features → boards/common/arduino-mkr/Makefile.features
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion boards/arduino-mkr-common/Makefile.include → boards/common/arduino-mkr/Makefile.include
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
0 boards/arduino-mkr-common/board.c → boards/common/arduino-mkr/board.c
View file
File renamed without changes.
0 ...rduino-mkr-common/include/arduino_board.h → ...ommon/arduino-mkr/include/arduino_board.h
View file
File renamed without changes.
0 ...duino-mkr-common/include/arduino_pinmap.h → ...mmon/arduino-mkr/include/arduino_pinmap.h
View file
File renamed without changes.
0 ...arduino-mkr-common/include/board_common.h → ...common/arduino-mkr/include/board_common.h
View file
File renamed without changes.
0 .../arduino-mkr-common/include/gpio_params.h → .../common/arduino-mkr/include/gpio_params.h
View file
File renamed without changes.
0 .../arduino-mkr-common/include/periph_conf.h → .../common/arduino-mkr/include/periph_conf.h
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions boards/frdm-common/Makefile.include → boards/common/frdm/Makefile.include
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 boards/frdm-common/dist/old-openocd-kx.cfg → boards/common/frdm/dist/old-openocd-kx.cfg
View file
File renamed without changes.
0 boards/frdm-common/dist/openocd-kx.cfg → boards/common/frdm/dist/openocd-kx.cfg
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion boards/remote-common/Makefile → boards/common/iotlab/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
MODULE = remote-common
MODULE = boards_common_iotlab

include $(RIOTBASE)/Makefile.base
0 boards/iotlab-common/Makefile.dep → boards/common/iotlab/Makefile.dep
View file
File renamed without changes.
0 boards/iotlab-common/Makefile.features → boards/common/iotlab/Makefile.features
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion boards/iotlab-common/Makefile.include → boards/common/iotlab/Makefile.include
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
0 boards/iotlab-common/board_init.c → boards/common/iotlab/board_init.c
View file
File renamed without changes.
0 boards/iotlab-common/include/board_common.h → boards/common/iotlab/include/board_common.h
View file
File renamed without changes.
0 boards/iotlab-common/include/gpio_params.h → boards/common/iotlab/include/gpio_params.h
View file
File renamed without changes.
0 ...s/iotlab-common/include/l3g4200d_params.h → ...s/common/iotlab/include/l3g4200d_params.h
View file
File renamed without changes.
0 ...iotlab-common/include/lsm303dlhc_params.h → ...common/iotlab/include/lsm303dlhc_params.h
View file
File renamed without changes.
0 ...otlab-common/include/periph_conf_common.h → ...ommon/iotlab/include/periph_conf_common.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion boards/msb-430-common/Makefile → boards/common/msb-430/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MODULE = msb-430-common
MODULE = boards_common_msb-430

DIRS = drivers

Expand Down
0 boards/msb-430-common/Makefile.features → boards/common/msb-430/Makefile.features
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions boards/msb-430-common/Makefile.include → boards/common/msb-430/Makefile.include
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
0 boards/msb-430-common/board_init.c → boards/common/msb-430/board_init.c
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion boards/msb-430-common/drivers/Makefile → boards/common/msb-430/drivers/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MODULE = msb-430-common-drivers
MODULE = boards_common_msb-430-drivers

include $(RIOTBOARD)/$(BOARD)/Makefile.include

Expand Down
0 ...-430-common/drivers/include/sht11-board.h → ...mon/msb-430/drivers/include/sht11-board.h
View file
File renamed without changes.
0 boards/msb-430-common/include/board_common.h → boards/common/msb-430/include/board_common.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion boards/msba2-common/Makefile → boards/common/msba2/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MODULE = msba2-common
MODULE = boards_common_msba2

DIRS = drivers

Expand Down
0 boards/msba2-common/Makefile.dep → boards/common/msba2/Makefile.dep
View file
File renamed without changes.
5 changes: 3 additions & 2 deletions boards/msba2-common/Makefile.include → boards/common/msba2/Makefile.include
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
0 boards/msba2-common/board_common_init.c → boards/common/msba2/board_common_init.c
View file
File renamed without changes.
3 changes: 3 additions & 0 deletions boards/common/msba2/drivers/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
MODULE = boards_common_msba2-drivers

include $(RIOTBASE)/Makefile.base
0 ...sba2-common/drivers/include/sht11-board.h → ...ommon/msba2/drivers/include/sht11-board.h
View file
File renamed without changes.
0 boards/msba2-common/include/msba2_common.h → boards/common/msba2/include/msba2_common.h
View file
File renamed without changes.
0 boards/msba2-common/tools/CHANGES → boards/common/msba2/tools/CHANGES
View file
File renamed without changes.
0 boards/msba2-common/tools/COPYING → boards/common/msba2/tools/COPYING
View file
File renamed without changes.
0 boards/msba2-common/tools/Makefile → boards/common/msba2/tools/Makefile
View file
File renamed without changes.
0 boards/msba2-common/tools/README.txt → boards/common/msba2/tools/README.txt
View file
File renamed without changes.
0 boards/msba2-common/tools/armtools.txt → boards/common/msba2/tools/armtools.txt
View file
File renamed without changes.
0 boards/msba2-common/tools/flash.cmd → boards/common/msba2/tools/flash.cmd
View file
File renamed without changes.
0 boards/msba2-common/tools/flashutil.sh → boards/common/msba2/tools/flashutil.sh
View file
File renamed without changes.
0 boards/msba2-common/tools/mkbootc → boards/common/msba2/tools/mkbootc
View file
File renamed without changes.
0 boards/msba2-common/tools/mkstaticlist → boards/common/msba2/tools/mkstaticlist
View file
File renamed without changes.
0 boards/msba2-common/tools/obj/.gitignore → boards/common/msba2/tools/obj/.gitignore
View file
File renamed without changes.
0 boards/msba2-common/tools/src/boot.h → boards/common/msba2/tools/src/boot.h
View file
File renamed without changes.
0 ...s/msba2-common/tools/src/boot_23xx.armasm → ...s/common/msba2/tools/src/boot_23xx.armasm
View file
File renamed without changes.
0 boards/msba2-common/tools/src/boot_23xx.c → boards/common/msba2/tools/src/boot_23xx.c
View file
File renamed without changes.
0 boards/msba2-common/tools/src/boot_23xx.h → boards/common/msba2/tools/src/boot_23xx.h
View file
File renamed without changes.
0 ...s/msba2-common/tools/src/boot_2xxx.armasm → ...s/common/msba2/tools/src/boot_2xxx.armasm
View file
File renamed without changes.
0 boards/msba2-common/tools/src/boot_2xxx.c → boards/common/msba2/tools/src/boot_2xxx.c
View file
File renamed without changes.
0 boards/msba2-common/tools/src/boot_2xxx.h → boards/common/msba2/tools/src/boot_2xxx.h
View file
File renamed without changes.
0 boards/msba2-common/tools/src/chipinfo.c → boards/common/msba2/tools/src/chipinfo.c
View file
File renamed without changes.
0 boards/msba2-common/tools/src/chipinfo.h → boards/common/msba2/tools/src/chipinfo.h
View file
File renamed without changes.
0 boards/msba2-common/tools/src/cksum_test.c → boards/common/msba2/tools/src/cksum_test.c
View file
File renamed without changes.
0 boards/msba2-common/tools/src/control_2xxx.c → boards/common/msba2/tools/src/control_2xxx.c
View file
File renamed without changes.
0 boards/msba2-common/tools/src/control_2xxx.h → boards/common/msba2/tools/src/control_2xxx.h
View file
File renamed without changes.
0 boards/msba2-common/tools/src/download.c → boards/common/msba2/tools/src/download.c
View file
File renamed without changes.
0 boards/msba2-common/tools/src/download.h → boards/common/msba2/tools/src/download.h
View file
File renamed without changes.
0 boards/msba2-common/tools/src/gui.c → boards/common/msba2/tools/src/gui.c
View file
File renamed without changes.
0 boards/msba2-common/tools/src/gui.h → boards/common/msba2/tools/src/gui.h
View file
File renamed without changes.
0 boards/msba2-common/tools/src/ihex.c → boards/common/msba2/tools/src/ihex.c
View file
File renamed without changes.
0 boards/msba2-common/tools/src/ihex.h → boards/common/msba2/tools/src/ihex.h
View file
File renamed without changes.
0 boards/msba2-common/tools/src/lpc2k_pgm.c → boards/common/msba2/tools/src/lpc2k_pgm.c
View file
File renamed without changes.
0 boards/msba2-common/tools/src/lpc2k_pgm.h → boards/common/msba2/tools/src/lpc2k_pgm.h
View file
File renamed without changes.
0 boards/msba2-common/tools/src/pseudoterm.c → boards/common/msba2/tools/src/pseudoterm.c
View file
File renamed without changes.
0 boards/msba2-common/tools/src/serial.c → boards/common/msba2/tools/src/serial.c
View file
File renamed without changes.
0 boards/msba2-common/tools/src/serial.h → boards/common/msba2/tools/src/serial.h
View file
File renamed without changes.
0 boards/msba2-common/tools/src/settings.c → boards/common/msba2/tools/src/settings.c
View file
File renamed without changes.
0 boards/msba2-common/tools/src/settings.h → boards/common/msba2/tools/src/settings.h
View file
File renamed without changes.
0 boards/msba2-common/tools/src/uuencode.c → boards/common/msba2/tools/src/uuencode.c
View file
File renamed without changes.
0 boards/msba2-common/tools/src/uuencode.h → boards/common/msba2/tools/src/uuencode.h
View file
File renamed without changes.
0 boards/msba2-common/tools/termctrl.sh → boards/common/msba2/tools/termctrl.sh
View file
File renamed without changes.
0 boards/nucleo-common/Makefile → boards/common/nucleo/Makefile
View file
File renamed without changes.
0 boards/nucleo-common/Makefile.dep → boards/common/nucleo/Makefile.dep
View file
File renamed without changes.
0 boards/nucleo-common/Makefile.features → boards/common/nucleo/Makefile.features
View file
File renamed without changes.
5 changes: 5 additions & 0 deletions boards/common/nucleo/Makefile.include
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# include nucleo common serial configuration
include $(RIOTBOARD)/common/nucleo/Makefile.include.serial

# add the common header files to the include path
INCLUDES += -I$(RIOTBOARD)/common/nucleo/include
18 changes: 9 additions & 9 deletions boards/nucleo-common/Makefile.include.serial → boards/common/nucleo/Makefile.include.serial
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ export STLINK_VERSION ?= 2-1
# Choose OpenOCD board configuration depending on CPU type
ifeq (,$(OPENOCD_CONFIG))
ifeq ($(CPU),stm32f0)
export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-f0.cfg
export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f0.cfg
else ifeq ($(CPU),stm32f1)
export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-f1.cfg
export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f1.cfg
else ifeq ($(CPU),stm32f2)
export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-f2.cfg
export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f2.cfg
else ifeq ($(CPU),stm32f3)
export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-f3.cfg
export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f3.cfg
else ifeq ($(CPU),stm32f4)
export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-f4.cfg
export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f4.cfg
else ifeq ($(CPU),stm32f7)
export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-f7.cfg
export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f7.cfg
else ifeq ($(CPU),stm32l0)
export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-l0.cfg
export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-l0.cfg
else ifeq ($(CPU),stm32l1)
export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-l1.cfg
export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-l1.cfg
else ifeq ($(CPU),stm32l4)
export OPENOCD_CONFIG := $(RIOTBOARD)/nucleo-common/dist/openocd-l4.cfg
export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-l4.cfg
endif
endif

Expand Down
0 boards/nucleo-common/dist/openocd-f0.cfg → boards/common/nucleo/dist/openocd-f0.cfg
View file
File renamed without changes.
0 boards/nucleo-common/dist/openocd-f1.cfg → boards/common/nucleo/dist/openocd-f1.cfg
View file
File renamed without changes.
0 boards/nucleo-common/dist/openocd-f2.cfg → boards/common/nucleo/dist/openocd-f2.cfg
View file
File renamed without changes.
0 boards/nucleo-common/dist/openocd-f3.cfg → boards/common/nucleo/dist/openocd-f3.cfg
View file
File renamed without changes.
0 boards/nucleo-common/dist/openocd-f4.cfg → boards/common/nucleo/dist/openocd-f4.cfg
View file
File renamed without changes.
0 boards/nucleo-common/dist/openocd-f7.cfg → boards/common/nucleo/dist/openocd-f7.cfg
View file
File renamed without changes.
0 boards/nucleo-common/dist/openocd-l0.cfg → boards/common/nucleo/dist/openocd-l0.cfg
View file
File renamed without changes.
0 boards/nucleo-common/dist/openocd-l1.cfg → boards/common/nucleo/dist/openocd-l1.cfg
View file
File renamed without changes.
0 boards/nucleo-common/dist/openocd-l4.cfg → boards/common/nucleo/dist/openocd-l4.cfg
View file
File renamed without changes.
0 boards/nucleo-common/include/arduino_board.h → boards/common/nucleo/include/arduino_board.h
View file
File renamed without changes.
0 ...ds/nucleo-common/include/arduino_pinmap.h → ...ds/common/nucleo/include/arduino_pinmap.h
View file
File renamed without changes.
0 boards/nucleo-common/include/board_common.h → boards/common/nucleo/include/board_common.h
View file
File renamed without changes.
0 boards/nucleo-common/include/gpio_params.h → boards/common/nucleo/include/gpio_params.h
View file
File renamed without changes.
0 boards/nucleo144-common/Makefile → boards/common/nucleo144/Makefile
View file
File renamed without changes.
0 boards/nucleo144-common/Makefile.features → boards/common/nucleo144/Makefile.features
View file
File renamed without changes.
5 changes: 5 additions & 0 deletions boards/common/nucleo144/Makefile.include
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# include nucleo common serial configuration
include $(RIOTBOARD)/common/nucleo/Makefile.include.serial

# add the common header files to the include path
INCLUDES += -I$(RIOTBOARD)/common/nucleo144/include
0 .../nucleo144-common/include/arduino_board.h → .../common/nucleo144/include/arduino_board.h
View file
File renamed without changes.
0 ...nucleo144-common/include/arduino_pinmap.h → ...common/nucleo144/include/arduino_pinmap.h
View file
File renamed without changes.
0 ...s/nucleo144-common/include/board_common.h → ...s/common/nucleo144/include/board_common.h
View file
File renamed without changes.
0 ...ds/nucleo144-common/include/gpio_params.h → ...ds/common/nucleo144/include/gpio_params.h
View file
File renamed without changes.
0 boards/nucleo32-common/Makefile → boards/common/nucleo32/Makefile
View file
File renamed without changes.
0 boards/nucleo32-common/Makefile.features → boards/common/nucleo32/Makefile.features
View file
File renamed without changes.
5 changes: 5 additions & 0 deletions boards/common/nucleo32/Makefile.include
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# include nucleo common serial configuration
include $(RIOTBOARD)/common/nucleo/Makefile.include.serial

# add the common header files to the include path
INCLUDES += -I$(RIOTBOARD)/common/nucleo32/include
0 ...s/nucleo32-common/include/arduino_board.h → ...s/common/nucleo32/include/arduino_board.h
View file
File renamed without changes.
0 .../nucleo32-common/include/arduino_pinmap.h → .../common/nucleo32/include/arduino_pinmap.h
View file
File renamed without changes.
0 ...ds/nucleo32-common/include/board_common.h → ...ds/common/nucleo32/include/board_common.h
View file
File renamed without changes.
0 boards/nucleo32-common/include/gpio_params.h → boards/common/nucleo32/include/gpio_params.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion boards/iotlab-common/Makefile → boards/common/remote/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
MODULE = iotlab-common
MODULE = boards_common_remote

include $(RIOTBASE)/Makefile.base
0 boards/remote-common/Makefile.dep → boards/common/remote/Makefile.dep
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions boards/remote-common/Makefile.include → boards/common/remote/Makefile.include
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ export DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE)
export RESET_FLAGS = $(BINDIR)
export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb

# include remote-common includes
export INCLUDES += -I$(RIOTBOARD)/remote-common/include
# include common remote includes
export INCLUDES += -I$(RIOTBOARD)/common/remote/include

# setup serial terminal
include $(RIOTMAKE)/tools/serial.inc.mk
0 boards/remote-common/dist/debug.sh → boards/common/remote/dist/debug.sh
View file
File renamed without changes.
0 boards/remote-common/dist/flash.sh → boards/common/remote/dist/flash.sh
View file
File renamed without changes.
0 boards/remote-common/dist/reset.sh → boards/common/remote/dist/reset.sh
View file
File renamed without changes.
0 boards/remote-common/include/board_common.h → boards/common/remote/include/board_common.h
View file
File renamed without changes.
0 boards/remote-common/include/fancy_leds.h → boards/common/remote/include/fancy_leds.h
View file
File renamed without changes.
0 boards/remote-common/include/periph_common.h → boards/common/remote/include/periph_common.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion boards/arduino-mkr-common/Makefile → boards/common/wsn430/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
MODULE = arduino-mkr-common
MODULE = boards_common_wsn430

include $(RIOTBASE)/Makefile.base
4 changes: 2 additions & 2 deletions boards/wsn430-common/Makefile.include → boards/common/wsn430/Makefile.include
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ export OFLAGS = -O ihex
export FLASHER = mspdebug
export FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)"

# include wsn430-common includes
export INCLUDES += -I$(RIOTBOARD)/wsn430-common/include
# include common wsn430 includes
export INCLUDES += -I$(RIOTBOARD)/common/wsn430/include
0 boards/wsn430-common/board_init.c → boards/common/wsn430/board_init.c
View file
File renamed without changes.
0 boards/wsn430-common/include/board_common.h → boards/common/wsn430/include/board_common.h
View file
File renamed without changes.
0 boards/wsn430-common/include/periph_conf.h → boards/common/wsn430/include/periph_conf.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion boards/frdm-k22f/Makefile.include
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export CPU = kinetis
export CPU_MODEL = mk22fn512vlh12

# Include default FRDM board config
include $(RIOTBOARD)/frdm-common/Makefile.include
include $(RIOTBOARD)/common/frdm/Makefile.include
2 changes: 1 addition & 1 deletion boards/frdm-k64f/Makefile.include
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export CPU = kinetis
export CPU_MODEL = mk64fn1m0vll12

# Include default FRDM board config
include $(RIOTBOARD)/frdm-common/Makefile.include
include $(RIOTBOARD)/common/frdm/Makefile.include
2 changes: 1 addition & 1 deletion boards/iotlab-a8-m3/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MODULE = board

DIRS = $(RIOTBOARD)/iotlab-common
DIRS = $(RIOTBOARD)/common/iotlab

include $(RIOTBASE)/Makefile.base
2 changes: 1 addition & 1 deletion boards/iotlab-a8-m3/Makefile.dep
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include $(RIOTBOARD)/iotlab-common/Makefile.dep
include $(RIOTBOARD)/common/iotlab/Makefile.dep
2 changes: 1 addition & 1 deletion boards/iotlab-a8-m3/Makefile.features
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include $(RIOTBOARD)/iotlab-common/Makefile.features
include $(RIOTBOARD)/common/iotlab/Makefile.features

-include $(RIOTCPU)/stm32f1/Makefile.features
4 changes: 2 additions & 2 deletions boards/iotlab-a8-m3/Makefile.include
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
USEMODULE += iotlab-common
USEMODULE += boards_common_iotlab

include $(RIOTBOARD)/iotlab-common/Makefile.include
include $(RIOTBOARD)/common/iotlab/Makefile.include

# add iotlab-a8-m3 include path
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
2 changes: 1 addition & 1 deletion boards/iotlab-m3/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MODULE = board

DIRS = $(RIOTBOARD)/iotlab-common
DIRS = $(RIOTBOARD)/common/iotlab

include $(RIOTBASE)/Makefile.base
2 changes: 1 addition & 1 deletion boards/iotlab-m3/Makefile.dep
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include $(RIOTBOARD)/iotlab-common/Makefile.dep
include $(RIOTBOARD)/common/iotlab/Makefile.dep

ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += isl29020
Expand Down
2 changes: 1 addition & 1 deletion boards/iotlab-m3/Makefile.features
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include $(RIOTBOARD)/iotlab-common/Makefile.features
include $(RIOTBOARD)/common/iotlab/Makefile.features

-include $(RIOTCPU)/stm32f1/Makefile.features
4 changes: 2 additions & 2 deletions boards/iotlab-m3/Makefile.include
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
USEMODULE += iotlab-common
USEMODULE += boards_common_iotlab

include $(RIOTBOARD)/iotlab-common/Makefile.include
include $(RIOTBOARD)/common/iotlab/Makefile.include

# add iotlab-m3 include path
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
Loading

0 comments on commit da24cda

Please sign in to comment.