boards/common: clean up msba2 common files

The 'msba2' common files have accumulated many empty files are files that do nothing. This makes reasoning about the boards needlessly difficult. Trim down on `common/msba2/` so that it now only contains the setup for the UART/bootloader based flashing. This should eventuelly be moved to `makefiles/tools/`
RIOT-OS · Nov 16, 2019 · 60686c9 · 60686c9
1 parent e52c92e
commit 60686c9
Show file tree

Hide file tree

Showing 15 changed files with 10 additions and 59 deletions.
diff --git a/boards/avsextrem/Makefile b/boards/avsextrem/Makefile
@@ -1,5 +1,3 @@
 MODULE = board
 
-DIRS = $(RIOTBOARD)/common/msba2
-
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/avsextrem/Makefile.dep b/boards/avsextrem/Makefile.dep
@@ -1 +1,3 @@
-include $(RIOTBOARD)/common/msba2/Makefile.dep
+ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
+  USEMODULE += cc1100
+endif
diff --git a/boards/avsextrem/Makefile.features b/boards/avsextrem/Makefile.features
@@ -1,9 +1,9 @@
+CPU = lpc2387
+
 # Put defined MCU peripherals here (in alphabetical order)
 FEATURES_PROVIDED += periph_rtc
 FEATURES_PROVIDED += periph_spi
 FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # Various other features (if any)
-
-include $(RIOTBOARD)/common/msba2/Makefile.features
diff --git a/boards/avsextrem/Makefile.include b/boards/avsextrem/Makefile.include
@@ -1,3 +1 @@
-USEMODULE += boards_common_msba2
-
 include $(RIOTBOARD)/common/msba2/Makefile.include
diff --git a/boards/avsextrem/include/board.h b/boards/avsextrem/include/board.h
@@ -22,8 +22,9 @@
 
 #ifndef BOARD_H
 #define BOARD_H
+
+#include "lpc2387.h"
 #include "bitarithm.h"
-#include "msba2_common.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/boards/common/msba2/Makefile b/boards/common/msba2/Makefile
diff --git a/boards/common/msba2/Makefile.dep b/boards/common/msba2/Makefile.dep
diff --git a/boards/common/msba2/Makefile.features b/boards/common/msba2/Makefile.features
diff --git a/boards/common/msba2/Makefile.include b/boards/common/msba2/Makefile.include
@@ -21,5 +21,3 @@ include $(RIOTMAKE)/tools/serial.inc.mk
 
 FLASHFILE ?= $(HEXFILE)
 FFLAGS = $(PROG_DEV) $(FLASHFILE)
-
-INCLUDES += -I$(RIOTBOARD)/common/msba2/include
diff --git a/boards/common/msba2/include/msba2_common.h b/boards/common/msba2/include/msba2_common.h
diff --git a/boards/msba2/Makefile b/boards/msba2/Makefile
@@ -1,5 +1,3 @@
 MODULE = board
 
-DIRS = $(RIOTBOARD)/common/msba2
-
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/msba2/Makefile.dep b/boards/msba2/Makefile.dep
@@ -1,5 +1,3 @@
-include $(RIOTBOARD)/common/msba2/Makefile.dep
-
 ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
   USEMODULE += cc1100
 endif

diff --git a/boards/msba2/Makefile.features b/boards/msba2/Makefile.features
@@ -1,3 +1,5 @@
+CPU = lpc2387
+
 # Put defined MCU peripherals here (in alphabetical order)
 FEATURES_PROVIDED += periph_pwm
 FEATURES_PROVIDED += periph_rtc
@@ -6,5 +8,3 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # Various other features (if any)
-
-include $(RIOTBOARD)/common/msba2/Makefile.features
diff --git a/boards/msba2/Makefile.include b/boards/msba2/Makefile.include
@@ -1,4 +1,2 @@
-USEMODULE += boards_common_msba2
-
 include $(RIOTBOARD)/common/msba2/Makefile.include
 include $(RIOTMAKE)/tools/openocd.inc.mk
diff --git a/boards/msba2/include/board.h b/boards/msba2/include/board.h
@@ -19,7 +19,7 @@
 #ifndef BOARD_H
 #define BOARD_H
 
-#include "msba2_common.h"
+#include "lpc2387.h"
 #include "bitarithm.h"
 
 #ifdef __cplusplus
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1 @@
		USEMODULE += boards_common_msba2

		include $(RIOTBOARD)/common/msba2/Makefile.include
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,5 +21,3 @@ include $(RIOTMAKE)/tools/serial.inc.mk

		FLASHFILE ?= $(HEXFILE)
		FFLAGS = $(PROG_DEV) $(FLASHFILE)

		INCLUDES += -I$(RIOTBOARD)/common/msba2/include