Skip to content
Permalink
Browse files

ext: nordic: Align nrfx_config_* files with templates from nrfx v1.7.2

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 <andrzej.glabek@nordicsemi.no>
  • Loading branch information...
anangl authored and carlescufi committed Jul 25, 2019
1 parent 396bbae commit ad69bb9d96cb69bd7f4c0647d4e2ee56af4ccf74
@@ -1431,7 +1431,7 @@
#ifdef CONFIG_NRFX_UART
#define NRFX_UART_ENABLED 1
#endif
// <o> NRFX_UART0_ENABLED - Enable UART0 instance
// <q> NRFX_UART0_ENABLED - Enable UART0 instance
#ifdef CONFIG_NRFX_UART
#define NRFX_UART0_ENABLED 1
#endif
@@ -2120,7 +2120,7 @@
#ifdef CONFIG_NRFX_UARTE
#define NRFX_UARTE_ENABLED 1
#endif
// <o> NRFX_UARTE0_ENABLED - Enable UARTE0 instance
// <q> 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
// <o> NRFX_UART0_ENABLED - Enable UART0 instance
// <q> NRFX_UART0_ENABLED - Enable UART0 instance
#ifdef CONFIG_NRFX_UART
#define NRFX_UART0_ENABLED 1
#endif
@@ -2140,7 +2140,7 @@
#ifdef CONFIG_NRFX_UARTE
#define NRFX_UARTE_ENABLED 1
#endif
// <o> NRFX_UARTE0_ENABLED - Enable UARTE0 instance
// <q> 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
// <o> NRFX_UART0_ENABLED - Enable UART0 instance
// <q> NRFX_UART0_ENABLED - Enable UART0 instance
#ifdef CONFIG_NRFX_UART
#define NRFX_UART0_ENABLED 1
#endif
@@ -2695,7 +2695,7 @@
#ifdef CONFIG_NRFX_UARTE
#define NRFX_UARTE_ENABLED 1
#endif
// <o> NRFX_UARTE0_ENABLED - Enable UARTE0 instance
// <q> 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
// <o> NRFX_UART0_ENABLED - Enable UART0 instance
// <q> NRFX_UART0_ENABLED - Enable UART0 instance
#ifdef CONFIG_NRFX_UART
#define NRFX_UART0_ENABLED 1
#endif
@@ -2785,12 +2785,12 @@
#ifdef CONFIG_NRFX_UARTE
#define NRFX_UARTE_ENABLED 1
#endif
// <o> NRFX_UARTE0_ENABLED - Enable UARTE0 instance
// <q> NRFX_UARTE0_ENABLED - Enable UARTE0 instance
#ifdef CONFIG_NRFX_UARTE0
#define NRFX_UARTE0_ENABLED 1
#endif

// <o> NRFX_UARTE1_ENABLED - Enable UARTE1 instance
// <q> 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
// <o> NRFX_UART0_ENABLED - Enable UART0 instance
// <q> NRFX_UART0_ENABLED - Enable UART0 instance
#ifdef CONFIG_NRFX_UART
#define NRFX_UART0_ENABLED 1
#endif
@@ -209,14 +209,11 @@
#endif
// <o> 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

// <o> NRFX_CLOCK_CONFIG_IRQ_PRIORITY - Interrupt priority.
@@ -1973,22 +1970,22 @@
#ifdef CONFIG_NRFX_UARTE
#define NRFX_UARTE_ENABLED 1
#endif
// <o> NRFX_UARTE0_ENABLED - Enables UARTE0 instance.
// <q> NRFX_UARTE0_ENABLED - Enables UARTE0 instance.
#ifdef CONFIG_NRFX_UARTE0
#define NRFX_UARTE0_ENABLED 1
#endif

// <o> NRFX_UARTE1_ENABLED - Enables UARTE1 instance.
// <q> NRFX_UARTE1_ENABLED - Enables UARTE1 instance.
#ifdef CONFIG_NRFX_UARTE1
#define NRFX_UARTE1_ENABLED 1
#endif

// <o> NRFX_UARTE2_ENABLED - Enables UARTE2 instance.
// <q> NRFX_UARTE2_ENABLED - Enables UARTE2 instance.
#ifdef CONFIG_NRFX_UARTE2
#define NRFX_UARTE2_ENABLED 1
#endif

// <o> NRFX_UARTE3_ENABLED - Enables UARTE3 instance.
// <q> NRFX_UARTE3_ENABLED - Enables UARTE3 instance.
#ifdef CONFIG_NRFX_UARTE3
#define NRFX_UARTE3_ENABLED 1
#endif

0 comments on commit ad69bb9

Please sign in to comment.
You can’t perform that action at this time.