nrf/nrfx_config: Use UARTE for nrf52xxx devices.

It was incomplete.
lvgl · Apr 5, 2023 · a529e0e · a529e0e
1 parent 4085565
commit a529e0e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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