nrf52840-dk: fix config dependency

2020-09-05 23:26:36 -03:00 · 2020-09-05 23:26:36 -03:00 · 61cd792437
parent d785394b0f
commit 61cd792437
3 changed files with 3 additions and 2 deletions
--- a/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig
+++ b/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig
@ -46,6 +46,5 @@ CONFIG_START_MONTH=3
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
-CONFIG_TIMER=y
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
--- a/boards/arm/nrf52/nrf52840-dk/src/Makefile
+++ b/boards/arm/nrf52/nrf52840-dk/src/Makefile
@ -76,7 +76,9 @@ CSRCS += nrf52_highpri.c
 endif

 ifeq ($(CONFIG_TIMER),y)
+ifeq ($(CONFIG_NRF52_TIMER),y)
 CSRCS += nrf52_timer.c
 endif
+endif

 include $(TOPDIR)/boards/Board.mk
--- a/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c
+++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c
@ -180,7 +180,7 @@ int nrf52_bringup(void)
    }
 #endif /* CONFIG_LPWAN_SX127X */

-#ifdef CONFIG_TIMER
+#if defined(CONFIG_TIMER) && defined(CONFIG_NRF52_TIMER)
  /* Configure TIMER driver */

  ret = nrf52_timer_driver_setup("/dev/timer0", NRF52_TIMER);