From 0a3f6f0a58dd444710eb080729055826fe5040e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Zadro=C5=BCniak?= Date: Thu, 11 Oct 2018 15:02:06 +0200 Subject: [PATCH] ext: hal: nordic: Add kconfig / CMakeLists entries for nrfx_usbd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds entries for USBD driver (nrfx_usbd) for kconfig / CMake. Updates nrf52840 configuration header to enable USBD. Signed-off-by: Paweł Zadrożniak --- ext/hal/nordic/CMakeLists.txt | 34 ++++++++++++++------------- ext/hal/nordic/Kconfig | 7 ++++++ ext/hal/nordic/nrfx_config_nrf52840.h | 11 ++++----- 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/ext/hal/nordic/CMakeLists.txt b/ext/hal/nordic/CMakeLists.txt index 124965b68b1..5b411cf2d09 100644 --- a/ext/hal/nordic/CMakeLists.txt +++ b/ext/hal/nordic/CMakeLists.txt @@ -18,21 +18,23 @@ if(CONFIG_HAS_NRFX) zephyr_sources(nrfx_glue.c) - zephyr_sources_ifdef(CONFIG_NRFX_PRS nrfx/drivers/prs/nrfx_prs.c) + zephyr_sources_ifdef(CONFIG_NRFX_PRS nrfx/drivers/prs/nrfx_prs.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_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) - zephyr_sources_ifdef(CONFIG_NRFX_SPI nrfx/drivers/src/nrfx_spi.c) - zephyr_sources_ifdef(CONFIG_NRFX_SPIM nrfx/drivers/src/nrfx_spim.c) - zephyr_sources_ifdef(CONFIG_NRFX_SPIS nrfx/drivers/src/nrfx_spis.c) - zephyr_sources_ifdef(CONFIG_NRFX_TIMER nrfx/drivers/src/nrfx_timer.c) - zephyr_sources_ifdef(CONFIG_NRFX_TWI nrfx/drivers/src/nrfx_twi.c) - zephyr_sources_ifdef(CONFIG_NRFX_TWIM nrfx/drivers/src/nrfx_twim.c) - zephyr_sources_ifdef(CONFIG_NRFX_UART nrfx/drivers/src/nrfx_uart.c) - zephyr_sources_ifdef(CONFIG_NRFX_UARTE nrfx/drivers/src/nrfx_uarte.c) - zephyr_sources_ifdef(CONFIG_NRFX_WDT nrfx/drivers/src/nrfx_wdt.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_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) + zephyr_sources_ifdef(CONFIG_NRFX_SPI nrfx/drivers/src/nrfx_spi.c) + zephyr_sources_ifdef(CONFIG_NRFX_SPIM nrfx/drivers/src/nrfx_spim.c) + zephyr_sources_ifdef(CONFIG_NRFX_SPIS nrfx/drivers/src/nrfx_spis.c) + zephyr_sources_ifdef(CONFIG_NRFX_SYSTICK nrfx/drivers/src/nrfx_systick.c) + zephyr_sources_ifdef(CONFIG_NRFX_TIMER nrfx/drivers/src/nrfx_timer.c) + zephyr_sources_ifdef(CONFIG_NRFX_TWI nrfx/drivers/src/nrfx_twi.c) + zephyr_sources_ifdef(CONFIG_NRFX_TWIM nrfx/drivers/src/nrfx_twim.c) + zephyr_sources_ifdef(CONFIG_NRFX_UART nrfx/drivers/src/nrfx_uart.c) + zephyr_sources_ifdef(CONFIG_NRFX_UARTE nrfx/drivers/src/nrfx_uarte.c) + zephyr_sources_ifdef(CONFIG_NRFX_USBD nrfx/drivers/src/nrfx_usbd.c) + zephyr_sources_ifdef(CONFIG_NRFX_WDT nrfx/drivers/src/nrfx_wdt.c) endif() diff --git a/ext/hal/nordic/Kconfig b/ext/hal/nordic/Kconfig index e870734b999..877c3139b16 100644 --- a/ext/hal/nordic/Kconfig +++ b/ext/hal/nordic/Kconfig @@ -35,6 +35,9 @@ config NRFX_SPIM config NRFX_SPIS bool +config NRFX_SYSTICK + bool + config NRFX_TIMER bool @@ -64,5 +67,9 @@ config NRFX_TWI config NRFX_TWIM bool +config NRFX_USBD + bool + select NRFX_SYSTICK + config NRFX_WDT bool diff --git a/ext/hal/nordic/nrfx_config_nrf52840.h b/ext/hal/nordic/nrfx_config_nrf52840.h index a7af7c10e84..bb694f5ff94 100644 --- a/ext/hal/nordic/nrfx_config_nrf52840.h +++ b/ext/hal/nordic/nrfx_config_nrf52840.h @@ -2233,10 +2233,9 @@ // // NRFX_SYSTICK_ENABLED - nrfx_systick - ARM(R) SysTick driver - - -#ifndef NRFX_SYSTICK_ENABLED -#define NRFX_SYSTICK_ENABLED 0 +//========================================================== +#ifdef CONFIG_NRFX_SYSTICK +#define NRFX_SYSTICK_ENABLED 1 #endif // NRFX_TIMER_ENABLED - nrfx_timer - TIMER periperal driver @@ -2976,8 +2975,8 @@ // NRFX_USBD_ENABLED - nrfx_usbd - USBD peripheral driver //========================================================== -#ifndef NRFX_USBD_ENABLED -#define NRFX_USBD_ENABLED 0 +#ifdef CONFIG_NRFX_USBD +#define NRFX_USBD_ENABLED 1 #endif // NRFX_USBD_CONFIG_IRQ_PRIORITY - Interrupt priority