From 61cd79243715886d4622076822e7151a709277c0 Mon Sep 17 00:00:00 2001
From: Matias N <matias@protobits.dev>
Date: Sat, 5 Sep 2020 23:26:36 -0300
Subject: [PATCH] nrf52840-dk: fix config dependency

---
 boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig | 1 -
 boards/arm/nrf52/nrf52840-dk/src/Makefile            | 2 ++
 boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig
index 0731a378ac..f27e1a59f5 100644
--- 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"
diff --git a/boards/arm/nrf52/nrf52840-dk/src/Makefile b/boards/arm/nrf52/nrf52840-dk/src/Makefile
index 1f31b25151..f02bab60f0 100644
--- 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
diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c b/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c
index 09bff167f7..1d08e25485 100644
--- 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);