From ce5149d84f038890f11cade1330d341c4a262f6b Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Mon, 23 Mar 2020 10:12:55 +0100 Subject: [PATCH] boards/nrf51d*: fix hardware flowcontrol configuration Use the periph_uart_hw_fc module and remove the unused UART_HWFLOWCTRL macro --- boards/nrf51dk/Makefile.dep | 2 ++ boards/nrf51dk/Makefile.features | 1 + boards/nrf51dk/include/periph_conf.h | 1 - boards/nrf51dongle/Makefile.dep | 2 ++ boards/nrf51dongle/Makefile.features | 1 + boards/nrf51dongle/include/periph_conf.h | 1 - 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/boards/nrf51dk/Makefile.dep b/boards/nrf51dk/Makefile.dep index 6df82abd16..7b8cb845b6 100644 --- a/boards/nrf51dk/Makefile.dep +++ b/boards/nrf51dk/Makefile.dep @@ -2,4 +2,6 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif +FEATURES_REQUIRED += periph_uart_hw_fc + include $(RIOTBOARD)/common/nrf51/Makefile.dep diff --git a/boards/nrf51dk/Makefile.features b/boards/nrf51dk/Makefile.features index cfced8cd17..1fad69e560 100644 --- a/boards/nrf51dk/Makefile.features +++ b/boards/nrf51dk/Makefile.features @@ -4,6 +4,7 @@ CPU_MODEL = nrf51x22xxac FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_uart +FEATURES_PROVIDED += periph_uart_hw_fc # include common nrf51 based boards features include $(RIOTBOARD)/common/nrf51/Makefile.features diff --git a/boards/nrf51dk/include/periph_conf.h b/boards/nrf51dk/include/periph_conf.h index e8d9d38447..4399bd50b3 100644 --- a/boards/nrf51dk/include/periph_conf.h +++ b/boards/nrf51dk/include/periph_conf.h @@ -34,7 +34,6 @@ extern "C" { */ #define UART_NUMOF (1U) /* UART pin configuration */ -#define UART_HWFLOWCTRL 1 #define UART_PIN_RX 11 #define UART_PIN_TX 9 #define UART_PIN_RTS 8 diff --git a/boards/nrf51dongle/Makefile.dep b/boards/nrf51dongle/Makefile.dep index babcd96228..581680658c 100644 --- a/boards/nrf51dongle/Makefile.dep +++ b/boards/nrf51dongle/Makefile.dep @@ -1 +1,3 @@ +FEATURES_REQUIRED += periph_uart_hw_fc + include $(RIOTBOARD)/common/nrf51/Makefile.dep diff --git a/boards/nrf51dongle/Makefile.features b/boards/nrf51dongle/Makefile.features index f090f45bae..4fd9dc32be 100644 --- a/boards/nrf51dongle/Makefile.features +++ b/boards/nrf51dongle/Makefile.features @@ -2,6 +2,7 @@ CPU_MODEL = nrf51x22xxab # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_uart +FEATURES_PROVIDED += periph_uart_hw_fc # include common nrf51 based boards features include $(RIOTBOARD)/common/nrf51/Makefile.features diff --git a/boards/nrf51dongle/include/periph_conf.h b/boards/nrf51dongle/include/periph_conf.h index e7ffc5a585..a3eee64eb9 100644 --- a/boards/nrf51dongle/include/periph_conf.h +++ b/boards/nrf51dongle/include/periph_conf.h @@ -34,7 +34,6 @@ extern "C" { */ #define UART_NUMOF (1U) /* UART pin configuration */ -#define UART_HWFLOWCTRL 1 #define UART_PIN_RX 11 #define UART_PIN_TX 9 #define UART_PIN_RTS 8