From 6c118cfc0b94b4d7bec6ab42db6cbddc7ad8b63b Mon Sep 17 00:00:00 2001
From: Hauke Petersen <hauke.petersen@fu-berlin.de>
Date: Thu, 16 Nov 2017 12:19:48 +0100
Subject: [PATCH] boards/msb-430: move shared code to common/msb-430
---
boards/{msb-430-common => common/msb-430}/Makefile | 2 +-
.../{msb-430-common => common/msb-430}/Makefile.features | 0
.../{msb-430-common => common/msb-430}/Makefile.include | 8 ++++----
boards/{msb-430-common => common/msb-430}/board_init.c | 0
.../{msb-430-common => common/msb-430}/drivers/Makefile | 2 +-
.../msb-430}/drivers/include/sht11-board.h | 0
.../msb-430}/include/board_common.h | 0
boards/msb-430/Makefile | 2 +-
boards/msb-430/Makefile.include | 4 ++--
boards/msb-430h/Makefile | 2 +-
boards/msb-430h/Makefile.include | 4 ++--
11 files changed, 12 insertions(+), 12 deletions(-)
rename boards/{msb-430-common => common/msb-430}/Makefile (62%)
rename boards/{msb-430-common => common/msb-430}/Makefile.features (100%)
rename boards/{msb-430-common => common/msb-430}/Makefile.include (80%)
rename boards/{msb-430-common => common/msb-430}/board_init.c (100%)
rename boards/{msb-430-common => common/msb-430}/drivers/Makefile (68%)
rename boards/{msb-430-common => common/msb-430}/drivers/include/sht11-board.h (100%)
rename boards/{msb-430-common => common/msb-430}/include/board_common.h (100%)
diff --git a/boards/msb-430-common/Makefile b/boards/common/msb-430/Makefile
similarity index 62%
rename from boards/msb-430-common/Makefile
rename to boards/common/msb-430/Makefile
index afb0e3e901..baa55d8731 100644
--- a/boards/msb-430-common/Makefile
+++ b/boards/common/msb-430/Makefile
@@ -1,4 +1,4 @@
-MODULE = msb-430-common
+MODULE = boards_common_msb-430
DIRS = drivers
diff --git a/boards/msb-430-common/Makefile.features b/boards/common/msb-430/Makefile.features
similarity index 100%
rename from boards/msb-430-common/Makefile.features
rename to boards/common/msb-430/Makefile.features
diff --git a/boards/msb-430-common/Makefile.include b/boards/common/msb-430/Makefile.include
similarity index 80%
rename from boards/msb-430-common/Makefile.include
rename to boards/common/msb-430/Makefile.include
index 7a9d36b5b3..e7ce2c6d83 100644
--- a/boards/msb-430-common/Makefile.include
+++ b/boards/common/msb-430/Makefile.include
@@ -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
diff --git a/boards/msb-430-common/board_init.c b/boards/common/msb-430/board_init.c
similarity index 100%
rename from boards/msb-430-common/board_init.c
rename to boards/common/msb-430/board_init.c
diff --git a/boards/msb-430-common/drivers/Makefile b/boards/common/msb-430/drivers/Makefile
similarity index 68%
rename from boards/msb-430-common/drivers/Makefile
rename to boards/common/msb-430/drivers/Makefile
index a9f8e5e470..ed11f0ae34 100644
--- a/boards/msb-430-common/drivers/Makefile
+++ b/boards/common/msb-430/drivers/Makefile
@@ -1,4 +1,4 @@
-MODULE = msb-430-common-drivers
+MODULE = boards_common_msb-430-drivers
include $(RIOTBOARD)/$(BOARD)/Makefile.include
diff --git a/boards/msb-430-common/drivers/include/sht11-board.h b/boards/common/msb-430/drivers/include/sht11-board.h
similarity index 100%
rename from boards/msb-430-common/drivers/include/sht11-board.h
rename to boards/common/msb-430/drivers/include/sht11-board.h
diff --git a/boards/msb-430-common/include/board_common.h b/boards/common/msb-430/include/board_common.h
similarity index 100%
rename from boards/msb-430-common/include/board_common.h
rename to boards/common/msb-430/include/board_common.h
diff --git a/boards/msb-430/Makefile b/boards/msb-430/Makefile
index 7746dd4dd9..854fb859cc 100644
--- a/boards/msb-430/Makefile
+++ b/boards/msb-430/Makefile
@@ -1,5 +1,5 @@
MODULE = board
-DIRS = $(RIOTBOARD)/msb-430-common
+DIRS = $(RIOTBOARD)/common/msb-430
include $(RIOTBASE)/Makefile.base
diff --git a/boards/msb-430/Makefile.include b/boards/msb-430/Makefile.include
index 2f65afb5d9..92d0ca027f 100644
--- a/boards/msb-430/Makefile.include
+++ b/boards/msb-430/Makefile.include
@@ -1,2 +1,2 @@
-USEMODULE += msb-430-common
-include $(RIOTBOARD)/msb-430-common/Makefile.include
+USEMODULE += boards_common_msb-430
+include $(RIOTBOARD)/common/msb-430/Makefile.include
diff --git a/boards/msb-430h/Makefile b/boards/msb-430h/Makefile
index 7746dd4dd9..854fb859cc 100644
--- a/boards/msb-430h/Makefile
+++ b/boards/msb-430h/Makefile
@@ -1,5 +1,5 @@
MODULE = board
-DIRS = $(RIOTBOARD)/msb-430-common
+DIRS = $(RIOTBOARD)/common/msb-430
include $(RIOTBASE)/Makefile.base
diff --git a/boards/msb-430h/Makefile.include b/boards/msb-430h/Makefile.include
index 2f65afb5d9..92d0ca027f 100644
--- a/boards/msb-430h/Makefile.include
+++ b/boards/msb-430h/Makefile.include
@@ -1,2 +1,2 @@
-USEMODULE += msb-430-common
-include $(RIOTBOARD)/msb-430-common/Makefile.include
+USEMODULE += boards_common_msb-430
+include $(RIOTBOARD)/common/msb-430/Makefile.include
--
GitLab