From abe583ed75cd14896983289dcbad19ca091f33e7 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Fri, 8 Dec 2017 16:31:50 +0000
Subject: [PATCH] Harmonise platform configuration files (nrf52dk)

---
 arch/cpu/nrf52832/dev/clock.c                            | 1 -
 arch/cpu/nrf52832/rtimer-arch.c                          | 1 -
 arch/platform/nrf52dk/contiki-conf.h                     | 2 +-
 arch/platform/nrf52dk/{platform-conf.h => nrf52dk-def.h} | 6 +++---
 4 files changed, 4 insertions(+), 6 deletions(-)
 rename arch/platform/nrf52dk/{platform-conf.h => nrf52dk-def.h} (97%)

diff --git a/arch/cpu/nrf52832/dev/clock.c b/arch/cpu/nrf52832/dev/clock.c
index 4ee09839d..68413c23b 100644
--- a/arch/cpu/nrf52832/dev/clock.c
+++ b/arch/cpu/nrf52832/dev/clock.c
@@ -53,7 +53,6 @@
 #include "nrf_delay.h"
 #include "app_error.h"
 #include "contiki.h"
-#include "platform-conf.h"
 
 /*---------------------------------------------------------------------------*/
 const nrf_drv_rtc_t rtc = NRF_DRV_RTC_INSTANCE(PLATFORM_RTC_INSTANCE_ID); /**< RTC instance used for platform clock */
diff --git a/arch/cpu/nrf52832/rtimer-arch.c b/arch/cpu/nrf52832/rtimer-arch.c
index 78f4790f2..02611ccbc 100644
--- a/arch/cpu/nrf52832/rtimer-arch.c
+++ b/arch/cpu/nrf52832/rtimer-arch.c
@@ -44,7 +44,6 @@
 #include "nrf_drv_timer.h"
 #include "app_error.h"
 #include "contiki.h"
-#include "platform-conf.h"
 
 static const nrf_drv_timer_t timer = NRF_DRV_TIMER_INSTANCE(PLATFORM_TIMER_INSTANCE_ID); /**< Timer instance used for rtimer */
 
diff --git a/arch/platform/nrf52dk/contiki-conf.h b/arch/platform/nrf52dk/contiki-conf.h
index 6e1529352..f7b8b1fa1 100644
--- a/arch/platform/nrf52dk/contiki-conf.h
+++ b/arch/platform/nrf52dk/contiki-conf.h
@@ -48,7 +48,7 @@
 #endif /* PROJECT_CONF_PATH */
 /*---------------------------------------------------------------------------*/
 /* Include platform peripherals configuration */
-#include "platform-conf.h"
+#include "nrf52dk-def.h"
 #include "nrf52832-def.h"
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/arch/platform/nrf52dk/platform-conf.h b/arch/platform/nrf52dk/nrf52dk-def.h
similarity index 97%
rename from arch/platform/nrf52dk/platform-conf.h
rename to arch/platform/nrf52dk/nrf52dk-def.h
index e2fd6cac0..ea4060ca2 100644
--- a/arch/platform/nrf52dk/platform-conf.h
+++ b/arch/platform/nrf52dk/nrf52dk-def.h
@@ -43,8 +43,8 @@
  *         Wojciech Bober <wojciech.bober@nordicsemi.no>
  *
  */
-#ifndef PLATFORM_CONF_H_
-#define PLATFORM_CONF_H_
+#ifndef NRF52DK_DEF_H_
+#define NRF52DK_DEF_H_
 
 #include "boards.h"
 
@@ -113,4 +113,4 @@
  *  @}
  *  @}
  */
-#endif /* PLATFORM_CONF_H_ */
+#endif /* NRF52DK_DEF_H_ */