From d7b426c10522e08637c83b1203ee3c543044986a Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Fri, 8 Dec 2017 16:45:46 +0000
Subject: [PATCH] Move user configuration to contiki-conf.h

---
 arch/platform/sky/contiki-conf.h  |  8 ++++++++
 arch/platform/sky/platform-conf.h | 10 ----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/arch/platform/sky/contiki-conf.h b/arch/platform/sky/contiki-conf.h
index 4b647e8b0..fb1192065 100644
--- a/arch/platform/sky/contiki-conf.h
+++ b/arch/platform/sky/contiki-conf.h
@@ -13,6 +13,10 @@
 #else
 #include "platform-conf.h"
 #endif /* PLATFORM_CONF_H */
+/* Map RF_CHANNEL to cc2420 default channel */
+#ifdef RF_CHANNEL
+#define CC2420_CONF_CHANNEL RF_CHANNEL
+#endif /* RF_CHANNEL */
 
 /* Configure radio driver */
 #ifndef NETSTACK_CONF_RADIO
@@ -35,4 +39,8 @@
 #define AES_128_CONF cc2420_aes_128_driver
 #endif /* AES_128_CONF */
 
+/* Disable the stack check library by default: .rom overflow otherwise */
+#ifndef STACK_CHECK_CONF_ENABLED
+#define STACK_CHECK_CONF_ENABLED 0
+#endif
 #endif /* CONTIKI_CONF_H */
diff --git a/arch/platform/sky/platform-conf.h b/arch/platform/sky/platform-conf.h
index 93edd1d67..8e7b5c069 100644
--- a/arch/platform/sky/platform-conf.h
+++ b/arch/platform/sky/platform-conf.h
@@ -59,11 +59,6 @@
 #define PLATFORM_HAS_SHT11   1
 #define PLATFORM_HAS_RADIO   1
 
-/* Map RF_CHANNEL to cc2420 default channel */
-#ifdef RF_CHANNEL
-#define CC2420_CONF_CHANNEL RF_CHANNEL
-#endif /* RF_CHANNEL */
-
 /* CPU target speed in Hz */
 #define F_CPU 3900000uL /*2457600uL*/
 
@@ -213,9 +208,4 @@ for SFD timestamping */
 /* Platform-specific define for the end of the stack region */
 #define STACK_CONF_ORIGIN     ((void *)0x3900)
 
-/* Disable the stack check library by default: .rom overflow otherwise */
-#ifndef STACK_CHECK_CONF_ENABLED
-#define STACK_CHECK_CONF_ENABLED 0
-#endif
-
 #endif /* PLATFORM_CONF_H_ */