From 220d16dc07c864e40ee5d55b94554d0778eb8aaa Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Tue, 18 Dec 2018 21:32:46 +0100 Subject: [PATCH 1/2] cpu/nrf5x: move periph_gpio features to common cpu level --- cpu/nrf51/Makefile.features | 2 -- cpu/nrf5x_common/Makefile.features | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cpu/nrf51/Makefile.features b/cpu/nrf51/Makefile.features index 1a47295f06..7d12728b90 100644 --- a/cpu/nrf51/Makefile.features +++ b/cpu/nrf51/Makefile.features @@ -1,3 +1 @@ -FEATURES_PROVIDED += periph_gpio periph_gpio_irq - -include $(RIOTCPU)/nrf5x_common/Makefile.features diff --git a/cpu/nrf5x_common/Makefile.features b/cpu/nrf5x_common/Makefile.features index 7fe6e293cd..dd63600abc 100644 --- a/cpu/nrf5x_common/Makefile.features +++ b/cpu/nrf5x_common/Makefile.features @@ -1,6 +1,7 @@ # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_cpuid FEATURES_PROVIDED += periph_flashpage +FEATURES_PROVIDED += periph_gpio periph_gpio_irq FEATURES_PROVIDED += periph_hwrng # Various other features (if any) From 839daf871aedc00445e6d86dc04c57c215103e30 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Tue, 18 Dec 2018 21:33:27 +0100 Subject: [PATCH 2/2] boards/nrf52: remove periph_gpio feature It is now provided at cpu level in cpu/nrf5x_common --- boards/common/nrf52/Makefile.features | 1 - 1 file changed, 1 deletion(-) diff --git a/boards/common/nrf52/Makefile.features b/boards/common/nrf52/Makefile.features index 4b34874d16..8d5b2b93e6 100644 --- a/boards/common/nrf52/Makefile.features +++ b/boards/common/nrf52/Makefile.features @@ -1,5 +1,4 @@ # Put defined MCU peripherals here (in alphabetical order) -FEATURES_PROVIDED += periph_gpio periph_gpio_irq FEATURES_PROVIDED += periph_rtt FEATURES_PROVIDED += periph_timer