diff --git a/msb-430-common/Jamfile b/msb-430-common/Jamfile
index 6cc5f8f1e3..29cd73df0c 100644
--- a/msb-430-common/Jamfile
+++ b/msb-430-common/Jamfile
@@ -27,7 +27,8 @@
 
 SubDir TOP board msb-430-common ;
 
-Module board : board_init.c debug_uart.c config.c ;
+Module board : board_init.c debug_uart.c ;
+Module config : config.c ;
 UseModule board ;
 
 SubInclude TOP cpu $(CPU) ;
diff --git a/msba2/Jamfile b/msba2/Jamfile
index 4bef1bd295..468b453066 100644
--- a/msba2/Jamfile
+++ b/msba2/Jamfile
@@ -27,7 +27,8 @@
 
 SubDir TOP board msba2 ;
 
-Module board : board_init.c config.c ;
+Module board : board_init.c ;
+Module config : config.c ;
 UseModule board ;
 UseModule board_common ;
 
diff --git a/msba2/board_init.c b/msba2/board_init.c
index de730c33b6..469c8fe7cd 100644
--- a/msba2/board_init.c
+++ b/msba2/board_init.c
@@ -44,9 +44,6 @@ and the mailinglist (subscription via web site)
 #include <lpc23xx.h>
 #include <VIC.h>
 #include <cpu.h>
-#include <config.h>
-#include <string.h>
-#include <flashrom.h>
 
 #define PCRTC         BIT9
 #define CL_CPU_DIV    4
@@ -156,13 +153,3 @@ void bl_blink(void) {
     LED_RED_OFF;
     LED_GREEN_OFF;
 }
-
-void bl_config_init(void) {
-    extern char configmem[];
-   if (*((uint16_t*) configmem) ==  CONFIG_KEY) {
-       memcpy(&sysconfig, (configmem + sizeof(CONFIG_KEY)), sizeof(sysconfig));
-   }
-   else {
-       config_save();
-   }
-}
diff --git a/msba2/config.c b/msba2/config.c
index 0ca7176651..1910f0b7ff 100644
--- a/msba2/config.c
+++ b/msba2/config.c
@@ -2,6 +2,16 @@
 #include <config.h>
 #include <flashrom.h>
 
+void config_load(void) {
+    extern char configmem[];
+   if (*((uint16_t*) configmem) ==  CONFIG_KEY) {
+       memcpy(&sysconfig, (configmem + sizeof(CONFIG_KEY)), sizeof(sysconfig));
+   }
+   else {
+       config_save();
+   }
+}
+
 uint8_t config_save(void) {
     configmem_t mem = { CONFIG_KEY, sysconfig  };
     return (flashrom_erase((uint8_t*) &configmem) && flashrom_write((uint8_t*) &configmem, (char*) &mem, sizeof(mem)));