Index: generic/src/main/main.c
===================================================================
--- generic/src/main/main.c	(revision 9aa72b42058acb9ec55cd96d960e524465201dc6)
+++ generic/src/main/main.c	(revision 0cb56f5db21f80d518ed87fdf28a0b52e34a0612)
@@ -93,4 +93,6 @@
 #endif
 
+#define CONFIG_STACK_SIZE	((1<<STACK_FRAMES)*STACK_SIZE)
+
 /** Bootstrap CPU main kernel routine
  *
@@ -129,6 +131,5 @@
 	
 	context_save(&ctx);
-	context_set(&ctx, FADDR(main_bsp_separated_stack), 
-		    stackaddr, CONFIG_STACK_SIZE);
+	context_set(&ctx, FADDR(main_bsp_separated_stack), stackaddr, THREAD_STACK_SIZE);
 	context_restore(&ctx);
 	/* not reached */