From 5c9e5ec7df85c77a46bba4ae2f787153a555e1a6 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Tue, 1 Oct 2019 21:31:08 +0200 Subject: [PATCH] boards/nrf52832: manage features in common directory --- boards/acd52832/Makefile.features | 1 - boards/common/nrf52/Makefile.features | 5 +++++ boards/common/nrf52/nrf52832/Makefile.features | 2 -- boards/nrf52832-mdk/Makefile.features | 1 - boards/nrf52dk/Makefile.features | 1 - boards/ruuvitag/Makefile.features | 1 - boards/thingy52/Makefile.features | 1 - 7 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 boards/common/nrf52/nrf52832/Makefile.features diff --git a/boards/acd52832/Makefile.features b/boards/acd52832/Makefile.features index ceeff08e1bb7..b26cc4344583 100644 --- a/boards/acd52832/Makefile.features +++ b/boards/acd52832/Makefile.features @@ -5,5 +5,4 @@ FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_uart -include $(RIOTBOARD)/common/nrf52/nrf52832/Makefile.features include $(RIOTBOARD)/common/nrf52/Makefile.features diff --git a/boards/common/nrf52/Makefile.features b/boards/common/nrf52/Makefile.features index ee20a15b3ea3..063a23727a01 100644 --- a/boards/common/nrf52/Makefile.features +++ b/boards/common/nrf52/Makefile.features @@ -9,3 +9,8 @@ endif # Various other features (if any) FEATURES_PROVIDED += ble_nimble + +ifneq (,$(findstring nrf52832, $(CPU_MODEL))) + # Nordic SoftDevice support in RIOT is verified for all nrf52832-based boards + FEATURES_PROVIDED += ble_nordic_softdevice +endif diff --git a/boards/common/nrf52/nrf52832/Makefile.features b/boards/common/nrf52/nrf52832/Makefile.features deleted file mode 100644 index 1dd6a0ba9e5b..000000000000 --- a/boards/common/nrf52/nrf52832/Makefile.features +++ /dev/null @@ -1,2 +0,0 @@ -# Nordic SoftDevice support in RIOT is verified for all nrf52832-based boards -FEATURES_PROVIDED += ble_nordic_softdevice diff --git a/boards/nrf52832-mdk/Makefile.features b/boards/nrf52832-mdk/Makefile.features index e6b8c7be4adb..f8e8dadfd913 100644 --- a/boards/nrf52832-mdk/Makefile.features +++ b/boards/nrf52832-mdk/Makefile.features @@ -4,5 +4,4 @@ CPU_MODEL = nrf52832xxaa FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_uart -include $(RIOTBOARD)/common/nrf52/nrf52832/Makefile.features include $(RIOTBOARD)/common/nrf52/Makefile.features diff --git a/boards/nrf52dk/Makefile.features b/boards/nrf52dk/Makefile.features index e956ea60b43e..b375a1a92730 100644 --- a/boards/nrf52dk/Makefile.features +++ b/boards/nrf52dk/Makefile.features @@ -1,4 +1,3 @@ CPU_MODEL = nrf52832xxaa -include $(RIOTBOARD)/common/nrf52/nrf52832/Makefile.features include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.features diff --git a/boards/ruuvitag/Makefile.features b/boards/ruuvitag/Makefile.features index 28d3b6138832..fecb0769548d 100644 --- a/boards/ruuvitag/Makefile.features +++ b/boards/ruuvitag/Makefile.features @@ -4,5 +4,4 @@ CPU_MODEL = nrf52832xxaa FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_uart -include $(RIOTBOARD)/common/nrf52/nrf52832/Makefile.features include $(RIOTBOARD)/common/nrf52/Makefile.features diff --git a/boards/thingy52/Makefile.features b/boards/thingy52/Makefile.features index e6b8c7be4adb..f8e8dadfd913 100644 --- a/boards/thingy52/Makefile.features +++ b/boards/thingy52/Makefile.features @@ -4,5 +4,4 @@ CPU_MODEL = nrf52832xxaa FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_uart -include $(RIOTBOARD)/common/nrf52/nrf52832/Makefile.features include $(RIOTBOARD)/common/nrf52/Makefile.features