michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ext: hal: nordic: Make it possible to build NRFX GPIOTE and PPI

Browse source 
This makes it possible for the application to enable building of the
GPIOTE and PPI subsystems in NRFX.

Signed-off-by: Jonas Norling <jonas.norling@greeneggs.se>
This commit is contained in:
Jonas Norling 2018-10-22 11:50:13 +02:00 • committed by Carles Cufí
commit ac960bf91b
6 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/hal/nordic/CMakeLists.txt
View file

@ -28,7 +28,9 @@ if(CONFIG_HAS_NRFX)
zephyr_sources_ifdef(CONFIG_NRFX_ADC nrfx/drivers/src/nrfx_adc.c) zephyr_sources_ifdef(CONFIG_NRFX_ADC nrfx/drivers/src/nrfx_adc.c)
zephyr_sources_ifdef(CONFIG_NRFX_CLOCK nrfx/drivers/src/nrfx_clock.c) zephyr_sources_ifdef(CONFIG_NRFX_CLOCK nrfx/drivers/src/nrfx_clock.c)
zephyr_sources_ifdef(CONFIG_NRFX_GPIOTE nrfx/drivers/src/nrfx_gpiote.c)
zephyr_sources_ifdef(CONFIG_NRFX_NFCT nrfx/drivers/src/nrfx_nfct.c) zephyr_sources_ifdef(CONFIG_NRFX_NFCT nrfx/drivers/src/nrfx_nfct.c)
zephyr_sources_ifdef(CONFIG_NRFX_PPI nrfx/drivers/src/nrfx_ppi.c)
zephyr_sources_ifdef(CONFIG_NRFX_PWM nrfx/drivers/src/nrfx_pwm.c) zephyr_sources_ifdef(CONFIG_NRFX_PWM nrfx/drivers/src/nrfx_pwm.c)
zephyr_sources_ifdef(CONFIG_NRFX_QDEC nrfx/drivers/src/nrfx_qdec.c) zephyr_sources_ifdef(CONFIG_NRFX_QDEC nrfx/drivers/src/nrfx_qdec.c)
zephyr_sources_ifdef(CONFIG_NRFX_RTC nrfx/drivers/src/nrfx_rtc.c) zephyr_sources_ifdef(CONFIG_NRFX_RTC nrfx/drivers/src/nrfx_rtc.c)

6
ext/hal/nordic/Kconfig
View file

@ -16,10 +16,16 @@ config NRFX_ADC
config NRFX_CLOCK config NRFX_CLOCK
bool bool
config NRFX_GPIOTE
bool
config NRFX_NFCT config NRFX_NFCT
bool bool
select NRFX_TIMER4 select NRFX_TIMER4
config NRFX_PPI
bool
config NRFX_PWM config NRFX_PWM
bool bool

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

@ -186,8 +186,8 @@
// <e> NRFX_GPIOTE_ENABLED - nrfx_gpiote - GPIOTE peripheral driver // <e> NRFX_GPIOTE_ENABLED - nrfx_gpiote - GPIOTE peripheral driver
//========================================================== //==========================================================
#ifndef NRFX_GPIOTE_ENABLED #ifdef CONFIG_NRFX_GPIOTE
#define NRFX_GPIOTE_ENABLED 0 #define NRFX_GPIOTE_ENABLED 1
#endif #endif
// <o> NRFX_GPIOTE_CONFIG_NUM_OF_LOW_POWER_EVENTS - Number of lower power input pins // <o> NRFX_GPIOTE_CONFIG_NUM_OF_LOW_POWER_EVENTS - Number of lower power input pins
#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_LOW_POWER_EVENTS #ifndef NRFX_GPIOTE_CONFIG_NUM_OF_LOW_POWER_EVENTS
@ -421,8 +421,8 @@
// <e> NRFX_PPI_ENABLED - nrfx_ppi - PPI peripheral allocator // <e> NRFX_PPI_ENABLED - nrfx_ppi - PPI peripheral allocator
//========================================================== //==========================================================
#ifndef NRFX_PPI_ENABLED #ifdef CONFIG_NRFX_PPI
#define NRFX_PPI_ENABLED 0 #define NRFX_PPI_ENABLED 1
#endif #endif
// <e> NRFX_PPI_CONFIG_LOG_ENABLED - Enables logging in the module. // <e> NRFX_PPI_CONFIG_LOG_ENABLED - Enables logging in the module.
//========================================================== //==========================================================

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

@ -260,8 +260,8 @@
// <e> NRFX_GPIOTE_ENABLED - nrfx_gpiote - GPIOTE peripheral driver // <e> NRFX_GPIOTE_ENABLED - nrfx_gpiote - GPIOTE peripheral driver
//========================================================== //==========================================================
#ifndef NRFX_GPIOTE_ENABLED #ifdef CONFIG_NRFX_GPIOTE
#define NRFX_GPIOTE_ENABLED 0 #define NRFX_GPIOTE_ENABLED 1
#endif #endif
// <o> NRFX_GPIOTE_CONFIG_NUM_OF_LOW_POWER_EVENTS - Number of lower power input pins // <o> NRFX_GPIOTE_CONFIG_NUM_OF_LOW_POWER_EVENTS - Number of lower power input pins
#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_LOW_POWER_EVENTS #ifndef NRFX_GPIOTE_CONFIG_NUM_OF_LOW_POWER_EVENTS
@ -479,8 +479,8 @@
// <e> NRFX_PPI_ENABLED - nrfx_ppi - PPI peripheral allocator // <e> NRFX_PPI_ENABLED - nrfx_ppi - PPI peripheral allocator
//========================================================== //==========================================================
#ifndef NRFX_PPI_ENABLED #ifdef CONFIG_NRFX_PPI
#define NRFX_PPI_ENABLED 0 #define NRFX_PPI_ENABLED 1
#endif #endif
// <e> NRFX_PPI_CONFIG_LOG_ENABLED - Enables logging in the module. // <e> NRFX_PPI_CONFIG_LOG_ENABLED - Enables logging in the module.
//========================================================== //==========================================================

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

@ -262,8 +262,8 @@
// <e> NRFX_GPIOTE_ENABLED - nrfx_gpiote - GPIOTE peripheral driver // <e> NRFX_GPIOTE_ENABLED - nrfx_gpiote - GPIOTE peripheral driver
//========================================================== //==========================================================
#ifndef NRFX_GPIOTE_ENABLED #ifdef CONFIG_NRFX_GPIOTE
#define NRFX_GPIOTE_ENABLED 0 #define NRFX_GPIOTE_ENABLED 1
#endif #endif
// <o> NRFX_GPIOTE_CONFIG_NUM_OF_LOW_POWER_EVENTS - Number of lower power input pins // <o> NRFX_GPIOTE_CONFIG_NUM_OF_LOW_POWER_EVENTS - Number of lower power input pins
#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_LOW_POWER_EVENTS #ifndef NRFX_GPIOTE_CONFIG_NUM_OF_LOW_POWER_EVENTS
@ -878,8 +878,8 @@
// <e> NRFX_PPI_ENABLED - nrfx_ppi - PPI peripheral allocator // <e> NRFX_PPI_ENABLED - nrfx_ppi - PPI peripheral allocator
//========================================================== //==========================================================
#ifndef NRFX_PPI_ENABLED #ifdef CONFIG_NRFX_PPI
#define NRFX_PPI_ENABLED 0 #define NRFX_PPI_ENABLED 1
#endif #endif
// <e> NRFX_PPI_CONFIG_LOG_ENABLED - Enables logging in the module. // <e> NRFX_PPI_CONFIG_LOG_ENABLED - Enables logging in the module.
//========================================================== //==========================================================

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

@ -262,8 +262,8 @@
// <e> NRFX_GPIOTE_ENABLED - nrfx_gpiote - GPIOTE peripheral driver // <e> NRFX_GPIOTE_ENABLED - nrfx_gpiote - GPIOTE peripheral driver
//========================================================== //==========================================================
#ifndef NRFX_GPIOTE_ENABLED #ifdef CONFIG_NRFX_GPIOTE
#define NRFX_GPIOTE_ENABLED 0 #define NRFX_GPIOTE_ENABLED 1
#endif #endif
// <o> NRFX_GPIOTE_CONFIG_NUM_OF_LOW_POWER_EVENTS - Number of lower power input pins // <o> NRFX_GPIOTE_CONFIG_NUM_OF_LOW_POWER_EVENTS - Number of lower power input pins
#ifndef NRFX_GPIOTE_CONFIG_NUM_OF_LOW_POWER_EVENTS #ifndef NRFX_GPIOTE_CONFIG_NUM_OF_LOW_POWER_EVENTS
@ -878,8 +878,8 @@
// <e> NRFX_PPI_ENABLED - nrfx_ppi - PPI peripheral allocator // <e> NRFX_PPI_ENABLED - nrfx_ppi - PPI peripheral allocator
//========================================================== //==========================================================
#ifndef NRFX_PPI_ENABLED #ifdef CONFIG_NRFX_PPI
#define NRFX_PPI_ENABLED 0 #define NRFX_PPI_ENABLED 1
#endif #endif
// <e> NRFX_PPI_CONFIG_LOG_ENABLED - Enables logging in the module. // <e> NRFX_PPI_CONFIG_LOG_ENABLED - Enables logging in the module.
//========================================================== //==========================================================