From add09c72eedba4afd3634143de580c87ea07b06d Mon Sep 17 00:00:00 2001 From: Kamil Piszczek Date: Tue, 2 Oct 2018 13:20:52 +0200 Subject: [PATCH] ext: hal: nrfx: adding nfct driver to Kconfig Added configuration option for NFCT driver to Kconfig. Signed-off-by: Kamil Piszczek --- ext/hal/nordic/CMakeLists.txt | 1 + ext/hal/nordic/Kconfig | 4 ++++ ext/hal/nordic/nrfx_config_nrf52832.h | 4 ++-- ext/hal/nordic/nrfx_config_nrf52840.h | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ext/hal/nordic/CMakeLists.txt b/ext/hal/nordic/CMakeLists.txt index a65656a696c..124965b68b1 100644 --- a/ext/hal/nordic/CMakeLists.txt +++ b/ext/hal/nordic/CMakeLists.txt @@ -22,6 +22,7 @@ if(CONFIG_HAS_NRFX) 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_NFCT nrfx/drivers/src/nrfx_nfct.c) zephyr_sources_ifdef(CONFIG_NRFX_PWM nrfx/drivers/src/nrfx_pwm.c) zephyr_sources_ifdef(CONFIG_NRFX_RTC nrfx/drivers/src/nrfx_rtc.c) zephyr_sources_ifdef(CONFIG_NRFX_SAADC nrfx/drivers/src/nrfx_saadc.c) diff --git a/ext/hal/nordic/Kconfig b/ext/hal/nordic/Kconfig index ec3a41882f3..e870734b999 100644 --- a/ext/hal/nordic/Kconfig +++ b/ext/hal/nordic/Kconfig @@ -16,6 +16,10 @@ config NRFX_ADC config NRFX_CLOCK bool +config NRFX_NFCT + bool + select NRFX_TIMER4 + config NRFX_PWM bool diff --git a/ext/hal/nordic/nrfx_config_nrf52832.h b/ext/hal/nordic/nrfx_config_nrf52832.h index ab2074b0fe5..9c3881b101c 100644 --- a/ext/hal/nordic/nrfx_config_nrf52832.h +++ b/ext/hal/nordic/nrfx_config_nrf52832.h @@ -664,8 +664,8 @@ // NRFX_NFCT_ENABLED - nrfx_nfct - NFCT peripheral driver //========================================================== -#ifndef NRFX_NFCT_ENABLED -#define NRFX_NFCT_ENABLED 0 +#ifdef CONFIG_NRFX_NFCT +#define NRFX_NFCT_ENABLED 1 #endif // NRFX_NFCT_CONFIG_IRQ_PRIORITY - Interrupt priority diff --git a/ext/hal/nordic/nrfx_config_nrf52840.h b/ext/hal/nordic/nrfx_config_nrf52840.h index a0f28ab7294..a7af7c10e84 100644 --- a/ext/hal/nordic/nrfx_config_nrf52840.h +++ b/ext/hal/nordic/nrfx_config_nrf52840.h @@ -664,8 +664,8 @@ // NRFX_NFCT_ENABLED - nrfx_nfct - NFCT peripheral driver //========================================================== -#ifndef NRFX_NFCT_ENABLED -#define NRFX_NFCT_ENABLED 0 +#ifdef CONFIG_NRFX_NFCT +#define NRFX_NFCT_ENABLED 1 #endif // NRFX_NFCT_CONFIG_IRQ_PRIORITY - Interrupt priority