commit 2bf5fc44f12bac0cac3e034912f62dcbea2df209
author Peter Mitsis <peter.mitsis@windriver.com> Fri May 22 11:37:03 2015 -0400
committer Anas Nashif <anas.nashif@intel.com> Fri Feb 05 20:14:13 2016 -0500
tree 0a5ba64ae4aa3b4beac476da879968b17f676412
parent a45f691d120eef57b1a187a33b229b90ac455851

Initialize idle task's stack related fields in sysgen

Hoists the initialization of the the microkernel's idle task's stack fields
out of the runtime and into sysgen thereby removing microkernel code from
the nanokernel initialization.

Change-Id: I54cbbec9e875a52b5fa52562e1a2770cd3ac1cc3
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>

kernel/nanokernel/nano_init.c

diff --git a/kernel/nanokernel/nano_init.c b/kernel/nanokernel/nano_init.c
index a424e22..0e10046 100644
--- a/kernel/nanokernel/nano_init.c
+++ b/kernel/nanokernel/nano_init.c
@@ -45,10 +45,6 @@
 #include <toolchain.h>
 #include <nanok.h>
 
-#ifdef CONFIG_MICROKERNEL
-#include <minik.h>
-#endif /* CONFIG_MICROKERNEL */
-
 /* kernel build timestamp items */
 
 #define BUILD_TIMESTAMP "BUILD: " __DATE__ " " __TIME__
@@ -79,7 +75,7 @@
 
 /* stack space for the background (or idle) task context */
 
-static char __noinit __stack main_task_stack[CONFIG_MAIN_STACK_SIZE];
+char __noinit __stack main_task_stack[CONFIG_MAIN_STACK_SIZE];
 
 /*
  * storage space for the interrupt stack
@@ -171,13 +167,6 @@
 
 	_nanokernel.task->flags |= ESSENTIAL;
 
-#if defined(CONFIG_MICROKERNEL)
-	/* fill in microkernel's TCB with info about the idle task */
-
-	_k_task_list[_k_task_count].workspace = (char *)_nanokernel.task;
-	_k_task_list[_k_task_count].worksize = CONFIG_MAIN_STACK_SIZE;
-#endif
-
 	/* perform any architecture-specific initialization */
 
 	nanoArchInit();

scripts/sysgen.py

diff --git a/scripts/sysgen.py b/scripts/sysgen.py
index 7f01515..db2e286 100755
--- a/scripts/sysgen.py
+++ b/scripts/sysgen.py
@@ -385,6 +385,8 @@
         kernel_main_c_out("char __noinit __stack __%s_stack[%d];\n" %
                           (task[0], task[3]))
 
+    kernel_main_c_out("extern char main_task_stack[CONFIG_MAIN_STACK_SIZE];\n")
+
     # declare task entry points
 
     kernel_main_c_out("\n")
@@ -429,7 +431,8 @@
 
     kernel_main_c_out("    {NULL, NULL, %d, 0x00000000, " % (num_prios - 1) +
         "0x00000000, 0x00000000,\n" +
-        "(taskstartfunction)NULL, NULL, 0, (taskabortfunction)NULL}\n")
+        "(taskstartfunction)NULL, main_task_stack, CONFIG_MAIN_STACK_SIZE, " +
+        "(taskabortfunction)NULL}\n")
     kernel_main_c_out("};\n")
 
     # currently scheduled task (idle task)