diff options
| author | robert-hh <robert@hammelrath.com> | 2023-03-21 08:08:30 +0100 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2023-04-05 10:00:06 +1000 |
| commit | a529e0e8cf1bcc5d1e6fc9ab5e4bfeb11c302a53 (patch) | |
| tree | 573df2196814e344fd8116e0bed94d9fafc65578 | |
| parent | 408556504cc80c785fff494b1773c23f37a62f36 (diff) | |
nrf/nrfx_config: Use UARTE for nrf52xxx devices.
It was incomplete.
| -rw-r--r-- | ports/nrf/Makefile | 8 | ||||
| -rw-r--r-- | ports/nrf/nrfx_config.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile index 61ae72d71..54b69b637 100644 --- a/ports/nrf/Makefile +++ b/ports/nrf/Makefile @@ -233,11 +233,6 @@ SRC_LIB_C += $(addprefix lib/,\ libm/roundf.c \ ) -SRC_NRFX += $(addprefix lib/nrfx/drivers/src/,\ - nrfx_uarte.c \ - nrfx_twim.c \ - ) - include drivers/secureboot/secureboot.mk endif @@ -263,11 +258,13 @@ endif SRC_NRFX += $(addprefix lib/nrfx/drivers/src/,\ prs/nrfx_prs.c \ nrfx_uart.c \ + nrfx_uarte.c \ nrfx_adc.c \ nrfx_saadc.c \ nrfx_temp.c \ nrfx_rng.c \ nrfx_twi.c \ + nrfx_twim.c \ nrfx_spi.c \ nrfx_spim.c \ nrfx_rtc.c \ @@ -319,6 +316,7 @@ SRC_C += $(addprefix lib/tinyusb/src/,\ tusb.c \ portable/nordic/nrf5x/dcd_nrf5x.c \ ) + endif DRIVERS_SRC_C += $(addprefix modules/,\ diff --git a/ports/nrf/nrfx_config.h b/ports/nrf/nrfx_config.h index 505014a2f..4669a0905 100644 --- a/ports/nrf/nrfx_config.h +++ b/ports/nrf/nrfx_config.h @@ -74,14 +74,16 @@ #endif #endif -#if defined(NRF51) || defined(NRF52_SERIES) +#if defined(NRF51) #define NRFX_UART_ENABLED 1 #define NRFX_UART0_ENABLED 1 #define NRFX_UART1_ENABLED 1 #elif defined(NRF52_SERIES) #define NRFX_UARTE_ENABLED 1 #define NRFX_UARTE0_ENABLED 1 + #if NRF52840 || NRF52840_XXAA #define NRFX_UARTE1_ENABLED 1 + #endif #else #define NRFX_UARTE_ENABLED 1 #define NRFX_UARTE0_ENABLED 1 |