From 60686c96dc4ef7774b0204b88a0473e738a6ba49 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Sat, 16 Nov 2019 11:57:15 +0100 Subject: [PATCH] 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/` --- boards/avsextrem/Makefile | 2 -- boards/avsextrem/Makefile.dep | 4 ++- boards/avsextrem/Makefile.features | 4 +-- boards/avsextrem/Makefile.include | 2 -- boards/avsextrem/include/board.h | 3 +- boards/common/msba2/Makefile | 3 -- boards/common/msba2/Makefile.dep | 0 boards/common/msba2/Makefile.features | 1 - boards/common/msba2/Makefile.include | 2 -- boards/common/msba2/include/msba2_common.h | 36 ---------------------- boards/msba2/Makefile | 2 -- boards/msba2/Makefile.dep | 2 -- boards/msba2/Makefile.features | 4 +-- boards/msba2/Makefile.include | 2 -- boards/msba2/include/board.h | 2 +- 15 files changed, 10 insertions(+), 59 deletions(-) delete mode 100644 boards/common/msba2/Makefile delete mode 100644 boards/common/msba2/Makefile.dep delete mode 100644 boards/common/msba2/Makefile.features delete mode 100644 boards/common/msba2/include/msba2_common.h diff --git a/boards/avsextrem/Makefile b/boards/avsextrem/Makefile index ad7c73d4ef86..f8fcbb53a065 100644 --- 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 index 130eea588a8b..7e202c3c59d6 100644 --- 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 index 61cb7956171c..ba0c44a33af7 100644 --- a/boards/avsextrem/Makefile.features +++ b/boards/avsextrem/Makefile.features @@ -1,3 +1,5 @@ +CPU = lpc2387 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_rtc FEATURES_PROVIDED += periph_spi @@ -5,5 +7,3 @@ 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 index 8c26e275d07b..15bd4578825d 100644 --- 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 index c1fdff573fbe..3001a22dc14e 100644 --- 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 deleted file mode 100644 index ccf58a084435..000000000000 --- a/boards/common/msba2/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -MODULE = boards_common_msba2 - -include $(RIOTBASE)/Makefile.base diff --git a/boards/common/msba2/Makefile.dep b/boards/common/msba2/Makefile.dep deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/boards/common/msba2/Makefile.features b/boards/common/msba2/Makefile.features deleted file mode 100644 index 158e45786818..000000000000 --- a/boards/common/msba2/Makefile.features +++ /dev/null @@ -1 +0,0 @@ -CPU = lpc2387 diff --git a/boards/common/msba2/Makefile.include b/boards/common/msba2/Makefile.include index 505bcd840c55..05b3b2391260 100644 --- 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 deleted file mode 100644 index 8ad58d5c31af..000000000000 --- a/boards/common/msba2/include/msba2_common.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2014 Kaspar Schleiser - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License v2.1. See the file LICENSE in the top level - * directory for more details. - */ - -/** - * @defgroup boards_common_msba2 MSB-A2 common - * @ingroup boards_common - * @brief Shared files and configuration for all MSB-A2 boards. - * @{ - * - * @file - * @brief MSB-A2 Common Board Definitions - * - * @author Kaspar Schleiser - */ -#ifndef MSBA2_COMMON_H -#define MSBA2_COMMON_H - - -#include -#include "lpc2387.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -} -#endif - -/** @} */ -#endif /* MSBA2_COMMON_H */ diff --git a/boards/msba2/Makefile b/boards/msba2/Makefile index ad7c73d4ef86..f8fcbb53a065 100644 --- 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 index b0ec516ac260..3ccaebc94667 100644 --- 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 index 388c64190677..86ce00383fdf 100644 --- 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 index 305c09b03d06..11f3351be173 100644 --- 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 index f3428dbb5d80..ec14288a9220 100644 --- 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