From ad69bb9d96cb69bd7f4c0647d4e2ee56af4ccf74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= Date: Thu, 25 Jul 2019 13:48:21 +0200 Subject: [PATCH] ext: nordic: Align nrfx_config_* files with templates from nrfx v1.7.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These files should be kept aligned with their templates, so that it is easy to tell what adjustments are needed to integrate nrfx into Zephyr. Signed-off-by: Andrzej Głąbek --- ext/hal/nordic/nrfx_config_nrf51.h | 2 +- ext/hal/nordic/nrfx_config_nrf52810.h | 4 ++-- ext/hal/nordic/nrfx_config_nrf52811.h | 4 ++-- ext/hal/nordic/nrfx_config_nrf52832.h | 4 ++-- ext/hal/nordic/nrfx_config_nrf52840.h | 6 +++--- ext/hal/nordic/nrfx_config_nrf9160.h | 17 +++++++---------- 6 files changed, 17 insertions(+), 20 deletions(-) diff --git a/ext/hal/nordic/nrfx_config_nrf51.h b/ext/hal/nordic/nrfx_config_nrf51.h index 0ece6018757..1cd3ee4ddec 100644 --- a/ext/hal/nordic/nrfx_config_nrf51.h +++ b/ext/hal/nordic/nrfx_config_nrf51.h @@ -1431,7 +1431,7 @@ #ifdef CONFIG_NRFX_UART #define NRFX_UART_ENABLED 1 #endif -// NRFX_UART0_ENABLED - Enable UART0 instance +// NRFX_UART0_ENABLED - Enable UART0 instance #ifdef CONFIG_NRFX_UART #define NRFX_UART0_ENABLED 1 #endif diff --git a/ext/hal/nordic/nrfx_config_nrf52810.h b/ext/hal/nordic/nrfx_config_nrf52810.h index 9c7ab7dee2a..cf4f0da8964 100644 --- a/ext/hal/nordic/nrfx_config_nrf52810.h +++ b/ext/hal/nordic/nrfx_config_nrf52810.h @@ -2120,7 +2120,7 @@ #ifdef CONFIG_NRFX_UARTE #define NRFX_UARTE_ENABLED 1 #endif -// NRFX_UARTE0_ENABLED - Enable UARTE0 instance +// NRFX_UARTE0_ENABLED - Enable UARTE0 instance #ifdef CONFIG_NRFX_UARTE0 #define NRFX_UARTE0_ENABLED 1 #endif @@ -2241,7 +2241,7 @@ #ifdef CONFIG_NRFX_UART #define NRFX_UART_ENABLED 1 #endif -// NRFX_UART0_ENABLED - Enable UART0 instance +// NRFX_UART0_ENABLED - Enable UART0 instance #ifdef CONFIG_NRFX_UART #define NRFX_UART0_ENABLED 1 #endif diff --git a/ext/hal/nordic/nrfx_config_nrf52811.h b/ext/hal/nordic/nrfx_config_nrf52811.h index c6290d4ed63..cee3bd098c5 100644 --- a/ext/hal/nordic/nrfx_config_nrf52811.h +++ b/ext/hal/nordic/nrfx_config_nrf52811.h @@ -2140,7 +2140,7 @@ #ifdef CONFIG_NRFX_UARTE #define NRFX_UARTE_ENABLED 1 #endif -// NRFX_UARTE0_ENABLED - Enable UARTE0 instance +// NRFX_UARTE0_ENABLED - Enable UARTE0 instance #ifdef CONFIG_NRFX_UARTE0 #define NRFX_UARTE0_ENABLED 1 #endif @@ -2261,7 +2261,7 @@ #ifdef CONFIG_NRFX_UART #define NRFX_UART_ENABLED 1 #endif -// NRFX_UART0_ENABLED - Enable UART0 instance +// NRFX_UART0_ENABLED - Enable UART0 instance #ifdef CONFIG_NRFX_UART #define NRFX_UART0_ENABLED 1 #endif diff --git a/ext/hal/nordic/nrfx_config_nrf52832.h b/ext/hal/nordic/nrfx_config_nrf52832.h index c20e6895320..8d6248ac71f 100644 --- a/ext/hal/nordic/nrfx_config_nrf52832.h +++ b/ext/hal/nordic/nrfx_config_nrf52832.h @@ -2695,7 +2695,7 @@ #ifdef CONFIG_NRFX_UARTE #define NRFX_UARTE_ENABLED 1 #endif -// NRFX_UARTE0_ENABLED - Enable UARTE0 instance +// NRFX_UARTE0_ENABLED - Enable UARTE0 instance #ifdef CONFIG_NRFX_UARTE0 #define NRFX_UARTE0_ENABLED 1 #endif @@ -2816,7 +2816,7 @@ #ifdef CONFIG_NRFX_UART #define NRFX_UART_ENABLED 1 #endif -// NRFX_UART0_ENABLED - Enable UART0 instance +// NRFX_UART0_ENABLED - Enable UART0 instance #ifdef CONFIG_NRFX_UART #define NRFX_UART0_ENABLED 1 #endif diff --git a/ext/hal/nordic/nrfx_config_nrf52840.h b/ext/hal/nordic/nrfx_config_nrf52840.h index 70ee5c99764..224a7e23570 100644 --- a/ext/hal/nordic/nrfx_config_nrf52840.h +++ b/ext/hal/nordic/nrfx_config_nrf52840.h @@ -2785,12 +2785,12 @@ #ifdef CONFIG_NRFX_UARTE #define NRFX_UARTE_ENABLED 1 #endif -// NRFX_UARTE0_ENABLED - Enable UARTE0 instance +// NRFX_UARTE0_ENABLED - Enable UARTE0 instance #ifdef CONFIG_NRFX_UARTE0 #define NRFX_UARTE0_ENABLED 1 #endif -// NRFX_UARTE1_ENABLED - Enable UARTE1 instance +// NRFX_UARTE1_ENABLED - Enable UARTE1 instance #ifdef CONFIG_NRFX_UARTE1 #define NRFX_UARTE1_ENABLED 1 #endif @@ -2911,7 +2911,7 @@ #ifdef CONFIG_NRFX_UART #define NRFX_UART_ENABLED 1 #endif -// NRFX_UART0_ENABLED - Enable UART0 instance +// NRFX_UART0_ENABLED - Enable UART0 instance #ifdef CONFIG_NRFX_UART #define NRFX_UART0_ENABLED 1 #endif diff --git a/ext/hal/nordic/nrfx_config_nrf9160.h b/ext/hal/nordic/nrfx_config_nrf9160.h index affee7399a2..24e1e868cf7 100644 --- a/ext/hal/nordic/nrfx_config_nrf9160.h +++ b/ext/hal/nordic/nrfx_config_nrf9160.h @@ -209,14 +209,11 @@ #endif // NRFX_CLOCK_CONFIG_LF_SRC - LF clock source. -// <0=> RC -// <1=> XTAL -// <2=> Synth -// <131073=> External Low Swing -// <196609=> External Full Swing +// <1=> RC +// <2=> XTAL #ifndef NRFX_CLOCK_CONFIG_LF_SRC -#define NRFX_CLOCK_CONFIG_LF_SRC 1 +#define NRFX_CLOCK_CONFIG_LF_SRC 2 #endif // NRFX_CLOCK_CONFIG_IRQ_PRIORITY - Interrupt priority. @@ -1973,22 +1970,22 @@ #ifdef CONFIG_NRFX_UARTE #define NRFX_UARTE_ENABLED 1 #endif -// NRFX_UARTE0_ENABLED - Enables UARTE0 instance. +// NRFX_UARTE0_ENABLED - Enables UARTE0 instance. #ifdef CONFIG_NRFX_UARTE0 #define NRFX_UARTE0_ENABLED 1 #endif -// NRFX_UARTE1_ENABLED - Enables UARTE1 instance. +// NRFX_UARTE1_ENABLED - Enables UARTE1 instance. #ifdef CONFIG_NRFX_UARTE1 #define NRFX_UARTE1_ENABLED 1 #endif -// NRFX_UARTE2_ENABLED - Enables UARTE2 instance. +// NRFX_UARTE2_ENABLED - Enables UARTE2 instance. #ifdef CONFIG_NRFX_UARTE2 #define NRFX_UARTE2_ENABLED 1 #endif -// NRFX_UARTE3_ENABLED - Enables UARTE3 instance. +// NRFX_UARTE3_ENABLED - Enables UARTE3 instance. #ifdef CONFIG_NRFX_UARTE3 #define NRFX_UARTE3_ENABLED 1 #endif