From 0f155db499ad81af5c99378ea809a21adf5923be Mon Sep 17 00:00:00 2001
From: Hauke Petersen <hauke.petersen@fu-berlin.de>
Date: Thu, 16 Nov 2017 12:23:35 +0100
Subject: [PATCH] boards/arduino-atmega: move shared code to
common/arduino-atmega
---
boards/arduino-atmega-common/Makefile | 3 ---
boards/arduino-duemilanove/Makefile | 2 +-
boards/arduino-duemilanove/Makefile.features | 2 +-
boards/arduino-duemilanove/Makefile.include | 4 ++--
boards/arduino-mega2560/Makefile | 2 +-
boards/arduino-mega2560/Makefile.features | 2 +-
boards/arduino-mega2560/Makefile.include | 4 ++--
boards/arduino-uno/Makefile | 2 +-
boards/arduino-uno/Makefile.features | 2 +-
boards/arduino-uno/Makefile.include | 4 ++--
boards/common/arduino-atmega/Makefile | 3 +++
.../arduino-atmega}/Makefile.dep | 0
.../arduino-atmega}/Makefile.features | 0
.../arduino-atmega}/Makefile.include | 4 ++--
.../{arduino-atmega-common => common/arduino-atmega}/board.c | 0
.../arduino-atmega}/dist/debug.sh | 0
.../arduino-atmega}/dist/debug_srv.sh | 0
.../arduino-atmega}/dist/gdb.conf | 0
.../{arduino-atmega-common => common/arduino-atmega}/doc.txt | 0
.../arduino-atmega}/include/arduino_board.h | 0
.../arduino-atmega}/include/arduino_pinmap.h | 0
.../arduino-atmega}/include/board_common.h | 0
.../arduino-atmega}/include/gpio_params.h | 0
.../arduino-atmega}/include/periph_conf.h | 0
24 files changed, 17 insertions(+), 17 deletions(-)
delete mode 100644 boards/arduino-atmega-common/Makefile
create mode 100644 boards/common/arduino-atmega/Makefile
rename boards/{arduino-atmega-common => common/arduino-atmega}/Makefile.dep (100%)
rename boards/{arduino-atmega-common => common/arduino-atmega}/Makefile.features (100%)
rename boards/{arduino-atmega-common => common/arduino-atmega}/Makefile.include (86%)
rename boards/{arduino-atmega-common => common/arduino-atmega}/board.c (100%)
rename boards/{arduino-atmega-common => common/arduino-atmega}/dist/debug.sh (100%)
rename boards/{arduino-atmega-common => common/arduino-atmega}/dist/debug_srv.sh (100%)
rename boards/{arduino-atmega-common => common/arduino-atmega}/dist/gdb.conf (100%)
rename boards/{arduino-atmega-common => common/arduino-atmega}/doc.txt (100%)
rename boards/{arduino-atmega-common => common/arduino-atmega}/include/arduino_board.h (100%)
rename boards/{arduino-atmega-common => common/arduino-atmega}/include/arduino_pinmap.h (100%)
rename boards/{arduino-atmega-common => common/arduino-atmega}/include/board_common.h (100%)
rename boards/{arduino-atmega-common => common/arduino-atmega}/include/gpio_params.h (100%)
rename boards/{arduino-atmega-common => common/arduino-atmega}/include/periph_conf.h (100%)
diff --git a/boards/arduino-atmega-common/Makefile b/boards/arduino-atmega-common/Makefile
deleted file mode 100644
index b2ec734f93..0000000000
--- 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 b597cd662a..8c6f44eb53 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 dea129ce0f..8ade47474f 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 51fdbd905c..e2fce678d4 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 b597cd662a..8c6f44eb53 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 ee597e1995..42491f5a94 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 fedd10f136..074a9e2887 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 b597cd662a..8c6f44eb53 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 dea129ce0f..8ade47474f 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 16616f50dc..c05afa46e8 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 0000000000..8cf36dd246
--- /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 3c8ed33990..a6a57822e1 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
--
GitLab