michaelh/zephyr
1
0
Fork 0
Code Releases Activity

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

Browse source 
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>
This commit is contained in:
Andrzej Głąbek 2019-07-25 13:48:21 +02:00 • committed by Carles Cufí
commit ad69bb9d96
6 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/hal/nordic/nrfx_config_nrf51.h
View file

@ -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

4
ext/hal/nordic/nrfx_config_nrf52810.h
View file

@ -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

4
ext/hal/nordic/nrfx_config_nrf52811.h
View file

@ -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

4
ext/hal/nordic/nrfx_config_nrf52832.h
View file

@ -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

6
ext/hal/nordic/nrfx_config_nrf52840.h
View file

@ -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

17
ext/hal/nordic/nrfx_config_nrf9160.h
View file

@ -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