diff --git a/boards/arduino-atmega-common/Makefile b/boards/arduino-atmega-common/Makefile deleted file mode 100644 index b2ec734f93a3e29efbcecea072e48d7ad483f9e1..0000000000000000000000000000000000000000 --- a/boards/arduino-atmega-common/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -MODULE = arduino-atmega-common - -include $(RIOTBASE)/Makefile.base diff --git a/boards/arduino-duemilanove/Makefile b/boards/arduino-duemilanove/Makefile index b597cd662a6ff3933f96f819ddea9ccef91a05d9..8c6f44eb536f7d60fb02b940c6c6a018e8fafdb0 100644 --- a/boards/arduino-duemilanove/Makefile +++ b/boards/arduino-duemilanove/Makefile @@ -1,5 +1,5 @@ MODULE = board -DIRS = $(RIOTBOARD)/arduino-atmega-common +DIRS = $(RIOTBOARD)/common/arduino-atmega include $(RIOTBASE)/Makefile.base diff --git a/boards/arduino-duemilanove/Makefile.features b/boards/arduino-duemilanove/Makefile.features index dea129ce0fb16f0d574c33ce167a56284f4e4d4c..8ade47474f65bc909aaa48e71175a1ff66b2772c 100644 --- a/boards/arduino-duemilanove/Makefile.features +++ b/boards/arduino-duemilanove/Makefile.features @@ -1,3 +1,3 @@ -include $(RIOTBOARD)/arduino-atmega-common/Makefile.features +include $(RIOTBOARD)/common/arduino-atmega/Makefile.features -include $(RIOTCPU)/atmega328p/Makefile.features diff --git a/boards/arduino-duemilanove/Makefile.include b/boards/arduino-duemilanove/Makefile.include index 51fdbd905cebb91796eff689b94cc577fceed7ad..e2fce678d4acb92cc50e6b85986b15be2c4933b8 100644 --- a/boards/arduino-duemilanove/Makefile.include +++ b/boards/arduino-duemilanove/Makefile.include @@ -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 diff --git a/boards/arduino-mega2560/Makefile b/boards/arduino-mega2560/Makefile index b597cd662a6ff3933f96f819ddea9ccef91a05d9..8c6f44eb536f7d60fb02b940c6c6a018e8fafdb0 100644 --- a/boards/arduino-mega2560/Makefile +++ b/boards/arduino-mega2560/Makefile @@ -1,5 +1,5 @@ MODULE = board -DIRS = $(RIOTBOARD)/arduino-atmega-common +DIRS = $(RIOTBOARD)/common/arduino-atmega include $(RIOTBASE)/Makefile.base diff --git a/boards/arduino-mega2560/Makefile.features b/boards/arduino-mega2560/Makefile.features index ee597e19953f68e784be9b03ab8dbc6e1bfc1277..42491f5a94b6f7f9295179f39acb8b9d60e567cb 100644 --- a/boards/arduino-mega2560/Makefile.features +++ b/boards/arduino-mega2560/Makefile.features @@ -1,3 +1,3 @@ -include $(RIOTBOARD)/arduino-atmega-common/Makefile.features +include $(RIOTBOARD)/common/arduino-atmega/Makefile.features -include $(RIOTCPU)/atmega2560/Makefile.features diff --git a/boards/arduino-mega2560/Makefile.include b/boards/arduino-mega2560/Makefile.include index fedd10f136547abd77c992817285e26b97267a73..074a9e28870cd9c95753c2a57b09127b6f082149 100644 --- a/boards/arduino-mega2560/Makefile.include +++ b/boards/arduino-mega2560/Makefile.include @@ -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 diff --git a/boards/arduino-uno/Makefile b/boards/arduino-uno/Makefile index b597cd662a6ff3933f96f819ddea9ccef91a05d9..8c6f44eb536f7d60fb02b940c6c6a018e8fafdb0 100644 --- a/boards/arduino-uno/Makefile +++ b/boards/arduino-uno/Makefile @@ -1,5 +1,5 @@ MODULE = board -DIRS = $(RIOTBOARD)/arduino-atmega-common +DIRS = $(RIOTBOARD)/common/arduino-atmega include $(RIOTBASE)/Makefile.base diff --git a/boards/arduino-uno/Makefile.features b/boards/arduino-uno/Makefile.features index dea129ce0fb16f0d574c33ce167a56284f4e4d4c..8ade47474f65bc909aaa48e71175a1ff66b2772c 100644 --- a/boards/arduino-uno/Makefile.features +++ b/boards/arduino-uno/Makefile.features @@ -1,3 +1,3 @@ -include $(RIOTBOARD)/arduino-atmega-common/Makefile.features +include $(RIOTBOARD)/common/arduino-atmega/Makefile.features -include $(RIOTCPU)/atmega328p/Makefile.features diff --git a/boards/arduino-uno/Makefile.include b/boards/arduino-uno/Makefile.include index 16616f50dc3c8d5d92d7faa22564875be403ad1b..c05afa46e82916574920008122f4265c3624a900 100644 --- a/boards/arduino-uno/Makefile.include +++ b/boards/arduino-uno/Makefile.include @@ -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 diff --git a/boards/common/arduino-atmega/Makefile b/boards/common/arduino-atmega/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..8cf36dd2468e848fd068afb1d5e1afe627ac80b5 --- /dev/null +++ b/boards/common/arduino-atmega/Makefile @@ -0,0 +1,3 @@ +MODULE = boards_common_arduino-atmega + +include $(RIOTBASE)/Makefile.base diff --git a/boards/arduino-atmega-common/Makefile.dep b/boards/common/arduino-atmega/Makefile.dep similarity index 100% rename from boards/arduino-atmega-common/Makefile.dep rename to boards/common/arduino-atmega/Makefile.dep diff --git a/boards/arduino-atmega-common/Makefile.features b/boards/common/arduino-atmega/Makefile.features similarity index 100% rename from boards/arduino-atmega-common/Makefile.features rename to boards/common/arduino-atmega/Makefile.features diff --git a/boards/arduino-atmega-common/Makefile.include b/boards/common/arduino-atmega/Makefile.include similarity index 86% rename from boards/arduino-atmega-common/Makefile.include rename to boards/common/arduino-atmega/Makefile.include index 3c8ed3399044467e8abac0a443940ece1aec973c..a6a57822e16d7f6096e46900a7c43803f08b135e 100644 --- a/boards/arduino-atmega-common/Makefile.include +++ b/boards/common/arduino-atmega/Makefile.include @@ -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 diff --git a/boards/arduino-atmega-common/board.c b/boards/common/arduino-atmega/board.c similarity index 100% rename from boards/arduino-atmega-common/board.c rename to boards/common/arduino-atmega/board.c diff --git a/boards/arduino-atmega-common/dist/debug.sh b/boards/common/arduino-atmega/dist/debug.sh similarity index 100% rename from boards/arduino-atmega-common/dist/debug.sh rename to boards/common/arduino-atmega/dist/debug.sh diff --git a/boards/arduino-atmega-common/dist/debug_srv.sh b/boards/common/arduino-atmega/dist/debug_srv.sh similarity index 100% rename from boards/arduino-atmega-common/dist/debug_srv.sh rename to boards/common/arduino-atmega/dist/debug_srv.sh diff --git a/boards/arduino-atmega-common/dist/gdb.conf b/boards/common/arduino-atmega/dist/gdb.conf similarity index 100% rename from boards/arduino-atmega-common/dist/gdb.conf rename to boards/common/arduino-atmega/dist/gdb.conf diff --git a/boards/arduino-atmega-common/doc.txt b/boards/common/arduino-atmega/doc.txt similarity index 100% rename from boards/arduino-atmega-common/doc.txt rename to boards/common/arduino-atmega/doc.txt diff --git a/boards/arduino-atmega-common/include/arduino_board.h b/boards/common/arduino-atmega/include/arduino_board.h similarity index 100% rename from boards/arduino-atmega-common/include/arduino_board.h rename to boards/common/arduino-atmega/include/arduino_board.h diff --git a/boards/arduino-atmega-common/include/arduino_pinmap.h b/boards/common/arduino-atmega/include/arduino_pinmap.h similarity index 100% rename from boards/arduino-atmega-common/include/arduino_pinmap.h rename to boards/common/arduino-atmega/include/arduino_pinmap.h diff --git a/boards/arduino-atmega-common/include/board_common.h b/boards/common/arduino-atmega/include/board_common.h similarity index 100% rename from boards/arduino-atmega-common/include/board_common.h rename to boards/common/arduino-atmega/include/board_common.h diff --git a/boards/arduino-atmega-common/include/gpio_params.h b/boards/common/arduino-atmega/include/gpio_params.h similarity index 100% rename from boards/arduino-atmega-common/include/gpio_params.h rename to boards/common/arduino-atmega/include/gpio_params.h diff --git a/boards/arduino-atmega-common/include/periph_conf.h b/boards/common/arduino-atmega/include/periph_conf.h similarity index 100% rename from boards/arduino-atmega-common/include/periph_conf.h rename to boards/common/arduino-atmega/include/periph_conf.h