From e688efdfcfc9b73952c685af1659f19d7e7948be Mon Sep 17 00:00:00 2001
From: Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
Date: Fri, 14 Feb 2014 00:09:19 +0100
Subject: [PATCH] core: kernel_init: call config_load in kernel_init

---
 core/kernel_init.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/core/kernel_init.c b/core/kernel_init.c
index 00a4eeddfd..55620803da 100644
--- a/core/kernel_init.c
+++ b/core/kernel_init.c
@@ -32,10 +32,17 @@
 #include "thread.h"
 #include "hwtimer.h"
 
+#define ENABLE_DEBUG (0)
+#include "debug.h"
+
 #ifdef MODULE_AUTO_INIT
 #include <auto_init.h>
 #endif
 
+#ifdef MODULE_CONFIG
+#include "config.h"
+#endif
+
 volatile int lpm_prevent_sleep = 0;
 
 extern int main(void);
@@ -81,6 +88,11 @@ void kernel_init(void)
         printf("kernel_init(): error creating main task.\n");
     }
 
+#ifdef MODULE_CONFIG
+    DEBUG("kernel_init(): loading config\n");
+    config_load();
+#endif
+
     printf("kernel_init(): jumping into first task...\n");
 
     cpu_switch_context_exit();