michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ext: hal: nordic: Add kconfig / CMakeLists entries for nrfx_usbd

Browse source 
Adds entries for USBD driver (nrfx_usbd) for kconfig / CMake.
Updates nrf52840 configuration header to enable USBD.

Signed-off-by: Paweł Zadrożniak <pawel.zadrozniak@nordicsemi.no>
This commit is contained in:
Paweł Zadrożniak 2018-10-11 15:02:06 +02:00 • committed by Carles Cufí
commit 0a3f6f0a58
3 changed files with 30 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,21 +18,23 @@ if(CONFIG_HAS_NRFX)
zephyr_sources(nrfx_glue.c) 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_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_NFCT nrfx/drivers/src/nrfx_nfct.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_PWM nrfx/drivers/src/nrfx_pwm.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)
zephyr_sources_ifdef(CONFIG_NRFX_SAADC nrfx/drivers/src/nrfx_saadc.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_SPI nrfx/drivers/src/nrfx_spi.c)
zephyr_sources_ifdef(CONFIG_NRFX_SPIM nrfx/drivers/src/nrfx_spim.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_SPIS nrfx/drivers/src/nrfx_spis.c)
zephyr_sources_ifdef(CONFIG_NRFX_TIMER nrfx/drivers/src/nrfx_timer.c) zephyr_sources_ifdef(CONFIG_NRFX_SYSTICK nrfx/drivers/src/nrfx_systick.c)
zephyr_sources_ifdef(CONFIG_NRFX_TWI nrfx/drivers/src/nrfx_twi.c) zephyr_sources_ifdef(CONFIG_NRFX_TIMER nrfx/drivers/src/nrfx_timer.c)
zephyr_sources_ifdef(CONFIG_NRFX_TWIM nrfx/drivers/src/nrfx_twim.c) zephyr_sources_ifdef(CONFIG_NRFX_TWI nrfx/drivers/src/nrfx_twi.c)
zephyr_sources_ifdef(CONFIG_NRFX_UART nrfx/drivers/src/nrfx_uart.c) zephyr_sources_ifdef(CONFIG_NRFX_TWIM nrfx/drivers/src/nrfx_twim.c)
zephyr_sources_ifdef(CONFIG_NRFX_UARTE nrfx/drivers/src/nrfx_uarte.c) zephyr_sources_ifdef(CONFIG_NRFX_UART nrfx/drivers/src/nrfx_uart.c)
zephyr_sources_ifdef(CONFIG_NRFX_WDT nrfx/drivers/src/nrfx_wdt.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() endif()

7
ext/hal/nordic/Kconfig
View file

@ -35,6 +35,9 @@ config NRFX_SPIM
config NRFX_SPIS config NRFX_SPIS
bool bool
config NRFX_SYSTICK
bool
config NRFX_TIMER config NRFX_TIMER
bool bool
@ -64,5 +67,9 @@ config NRFX_TWI
config NRFX_TWIM config NRFX_TWIM
bool bool
config NRFX_USBD
bool
select NRFX_SYSTICK
config NRFX_WDT config NRFX_WDT
bool bool

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

@ -2233,10 +2233,9 @@
// </e> // </e>
// <q> NRFX_SYSTICK_ENABLED - nrfx_systick - ARM(R) SysTick driver // <q> NRFX_SYSTICK_ENABLED - nrfx_systick - ARM(R) SysTick driver
//==========================================================
#ifdef CONFIG_NRFX_SYSTICK
#ifndef NRFX_SYSTICK_ENABLED #define NRFX_SYSTICK_ENABLED 1
#define NRFX_SYSTICK_ENABLED 0
#endif #endif
// <e> NRFX_TIMER_ENABLED - nrfx_timer - TIMER periperal driver // <e> NRFX_TIMER_ENABLED - nrfx_timer - TIMER periperal driver
@ -2976,8 +2975,8 @@
// <e> NRFX_USBD_ENABLED - nrfx_usbd - USBD peripheral driver // <e> NRFX_USBD_ENABLED - nrfx_usbd - USBD peripheral driver
//========================================================== //==========================================================
#ifndef NRFX_USBD_ENABLED #ifdef CONFIG_NRFX_USBD
#define NRFX_USBD_ENABLED 0 #define NRFX_USBD_ENABLED 1
#endif #endif
// <o> NRFX_USBD_CONFIG_IRQ_PRIORITY - Interrupt priority // <o> NRFX_USBD_CONFIG_IRQ_PRIORITY - Interrupt priority