Skip to content
Snippets Groups Projects
Commit 6b39ce96 authored by Oleg Hahm's avatar Oleg Hahm
Browse files

config: moved from core to sys

There's no need to run config_load from core directly, can be done by
auto_init.
parent 09f225f6
No related branches found
No related tags found
No related merge requests found
...@@ -39,10 +39,6 @@ ...@@ -39,10 +39,6 @@
#include <auto_init.h> #include <auto_init.h>
#endif #endif
#ifdef MODULE_CONFIG
#include "config.h"
#endif
volatile int lpm_prevent_sleep = 0; volatile int lpm_prevent_sleep = 0;
extern int main(void); extern int main(void);
...@@ -97,11 +93,6 @@ void kernel_init(void) ...@@ -97,11 +93,6 @@ void kernel_init(void)
printf("kernel_init(): error creating main task.\n"); 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"); printf("kernel_init(): jumping into first task...\n");
cpu_switch_context_exit(); cpu_switch_context_exit();
......
...@@ -19,6 +19,10 @@ ...@@ -19,6 +19,10 @@
#include "auto_init.h" #include "auto_init.h"
#ifdef MODULE_CONFIG
#include "config.h"
#endif
#ifdef MODULE_SHT11 #ifdef MODULE_SHT11
#include "sht11.h" #include "sht11.h"
#endif #endif
...@@ -187,6 +191,11 @@ void auto_init_net_if(void) ...@@ -187,6 +191,11 @@ void auto_init_net_if(void)
void auto_init(void) void auto_init(void)
{ {
#ifdef MODULE_CONFIG
DEBUG("Auto init loading config\n");
config_load();
#endif
#ifdef MODULE_VTIMER #ifdef MODULE_VTIMER
DEBUG("Auto init vtimer module.\n"); DEBUG("Auto init vtimer module.\n");
vtimer_init(); vtimer_init();
......
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment