kernel: replace all remaining nanokernel occurances

nashif · nashif · commit c1347b47303a · 2016-12-25T14:34:43.000-05:00
replace include &lt;nanokernel.h&gt; with &lt;kernel.h&gt; everywhere and also fix
any remaining mentions of nanokernel.

Keep the legacy samples/tests as is.

Change-Id: Iac48447bd191e83f21a719c69dc26233216d08dc
Signed-off-by: Anas Nashif &lt;anas.nashif@intel.com&gt;
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -252,7 +252,6 @@ S:	Supported
 F:	kernel/
 F:	include/nanokernel.h
 F:	include/microkernel.h
-F:	include/microkernel/
 F:	include/misc/
 F:	include/toolchain/
 F:	include/atomic.h
@@ -357,8 +356,8 @@ F:	arch/x86/core/crt0.S
 F:	include/device.h
 F:	include/init.h
 F:	include/power.h
-F:	kernel/microkernel/k_idle.c
-F:	kernel/nanokernel/device.c
+F:	kernel/k_idle.c
+F:	kernel/device.c
 F:	samples/power/
 
 QMSI
diff --git a/arch/arc/core/cache.c b/arch/arc/core/cache.c
@@ -23,7 +23,7 @@
  * This module contains functions for manipulation of the d-cache.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/util.h>
 #include <toolchain.h>
diff --git a/arch/arc/core/fault.c b/arch/arc/core/fault.c
@@ -25,7 +25,7 @@
 #include <sections.h>
 #include <inttypes.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <kernel_structs.h>
 
 #ifdef CONFIG_PRINTK
diff --git a/arch/arc/core/irq_manage.c b/arch/arc/core/irq_manage.c
@@ -27,7 +27,7 @@
  * number from 16 to last IRQ number on the platform.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/__assert.h>
 #include <toolchain.h>
diff --git a/arch/arc/core/irq_offload.c b/arch/arc/core/irq_offload.c
@@ -18,7 +18,7 @@
  * @file Software interrupts utility code - ARC implementation
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <irq_offload.h>
 
 static irq_offload_routine_t offload_routine;
diff --git a/arch/arc/core/sys_fatal_error_handler.c b/arch/arc/core/sys_fatal_error_handler.c
@@ -21,7 +21,7 @@
  * This module provides the _SysFatalErrorHandler() routine for ARCv2 BSPs.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <kernel_structs.h>
diff --git a/arch/arc/core/thread.c b/arch/arc/core/thread.c
@@ -21,7 +21,7 @@
  * Core thread related primitives for the ARCv2 processor architecture.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <toolchain.h>
 #include <kernel_structs.h>
 #include <offsets_short.h>
diff --git a/arch/arc/soc/quark_se_c1000_ss/soc.c b/arch/arc/soc/quark_se_c1000_ss/soc.c
@@ -21,7 +21,7 @@
  * for the Quark SE platform.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include "soc.h"
 #include <init.h>
 #include <quark_se/shared_mem.h>
diff --git a/arch/arm/core/cortex_m/exc_manage.c b/arch/arm/core/cortex_m/exc_manage.c
@@ -18,7 +18,7 @@
  * @file exception related routines
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <inttypes.h>
 
diff --git a/arch/arm/core/cortex_m/nmi.c b/arch/arm/core/cortex_m/nmi.c
@@ -23,7 +23,7 @@
  * custom run time handler.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/printk.h>
 #include <misc/reboot.h>
diff --git a/arch/arm/core/cortex_m/prep_c.c b/arch/arm/core/cortex_m/prep_c.c
@@ -26,7 +26,7 @@
  * initialization is performed.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <stdint.h>
 #include <toolchain.h>
 #include <linker-defs.h>
diff --git a/arch/arm/core/cortex_m/scb.c b/arch/arm/core/cortex_m/scb.c
@@ -24,7 +24,7 @@
  * definitions and more complex routines, if needed.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/util.h>
 
diff --git a/arch/arm/core/cortex_m/scs.c b/arch/arm/core/cortex_m/scs.c
@@ -23,7 +23,7 @@
  * definitions and more complex routines, if needed.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <toolchain.h>
 #include <sections.h>
diff --git a/arch/arm/core/fatal.c b/arch/arm/core/fatal.c
@@ -25,7 +25,7 @@
 #include <sections.h>
 #include <inttypes.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <kernel_structs.h>
 
 #ifdef CONFIG_PRINTK
diff --git a/arch/arm/core/fault.c b/arch/arm/core/fault.c
@@ -24,7 +24,7 @@
 #include <toolchain.h>
 #include <sections.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <kernel_structs.h>
 #include <inttypes.h>
 
diff --git a/arch/arm/core/irq_init.c b/arch/arm/core/irq_init.c
@@ -28,7 +28,7 @@
 
 #include <toolchain.h>
 #include <sections.h>
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 
 /**
diff --git a/arch/arm/core/irq_manage.c b/arch/arm/core/irq_manage.c
@@ -24,7 +24,7 @@
  * connecting ISRs at runtime.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/__assert.h>
 #include <toolchain.h>
diff --git a/arch/arm/core/irq_offload.c b/arch/arm/core/irq_offload.c
@@ -18,7 +18,7 @@
  * @file Software interrupts utility code - ARM implementation
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <irq_offload.h>
 
 static irq_offload_routine_t offload_routine;
diff --git a/arch/arm/core/thread.c b/arch/arm/core/thread.c
@@ -21,7 +21,7 @@
  * Core thread related primitives for the ARM Cortex-M processor architecture.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <toolchain.h>
 #include <kernel_structs.h>
 #include <wait_q.h>
diff --git a/arch/arm/soc/arm/beetle/soc.c b/arch/arm/soc/arm/beetle/soc.c
@@ -22,7 +22,7 @@
  * for the ARM LTD Beetle SoC.
  */
 
- #include <nanokernel.h>
+ #include <kernel.h>
  #include <device.h>
  #include <init.h>
  #include <soc.h>
diff --git a/arch/arm/soc/atmel_sam3/soc.c b/arch/arm/soc/atmel_sam3/soc.c
@@ -23,7 +23,7 @@
  * for the Atmel SAM3 family processor.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>
diff --git a/arch/arm/soc/nordic_nrf5/nrf51/soc.c b/arch/arm/soc/nordic_nrf5/nrf51/soc.c
@@ -23,7 +23,7 @@
  * for the Nordic Semiconductor nRF51 family processor.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>
diff --git a/arch/arm/soc/nordic_nrf5/nrf52/soc.c b/arch/arm/soc/nordic_nrf5/nrf52/soc.c
@@ -22,7 +22,7 @@
  * for the Nordic Semiconductor nRF52 family processor.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>
diff --git a/arch/arm/soc/nxp_kinetis/k6x/soc.c b/arch/arm/soc/nxp_kinetis/k6x/soc.c
@@ -23,7 +23,7 @@
  * hardware for the fsl_frdm_k64f platform.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>
diff --git a/arch/arm/soc/nxp_kinetis/k6x/soc_config.c b/arch/arm/soc/nxp_kinetis/k6x/soc_config.c
@@ -22,7 +22,7 @@
 #include <device.h>
 #include <init.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 
 #include "soc.h"
 #include <fsl_common.h>
diff --git a/arch/arm/soc/st_stm32/stm32f1/soc.c b/arch/arm/soc/st_stm32/stm32f1/soc.c
@@ -19,7 +19,7 @@
  * @brief System/hardware module for STM32F1 processor
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>
diff --git a/arch/arm/soc/st_stm32/stm32f4/soc.c b/arch/arm/soc/st_stm32/stm32f4/soc.c
@@ -20,7 +20,7 @@
  * @brief System/hardware module for STM32F4 processor
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>
diff --git a/arch/arm/soc/st_stm32/stm32l4/soc.c b/arch/arm/soc/st_stm32/stm32l4/soc.c
@@ -20,7 +20,7 @@
  * @brief System/hardware module for STM32L4 processor
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>
diff --git a/arch/arm/soc/ti_lm3s6965/soc.c b/arch/arm/soc/ti_lm3s6965/soc.c
@@ -22,7 +22,7 @@
  * for the ti_lm3s6965 platform.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>
diff --git a/arch/arm/soc/ti_lm3s6965/soc_config.c b/arch/arm/soc/ti_lm3s6965/soc_config.c
@@ -21,7 +21,7 @@
 #include <device.h>
 #include <init.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 
 #include "soc.h"
 
diff --git a/arch/arm/soc/ti_simplelink/cc32xx/soc.c b/arch/arm/soc/ti_simplelink/cc32xx/soc.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>
diff --git a/arch/nios2/core/cpu_idle.c b/arch/nios2/core/cpu_idle.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <kernel_structs.h>
 
 /**
diff --git a/arch/nios2/core/fatal.c b/arch/nios2/core/fatal.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <kernel_structs.h>
 #include <misc/printk.h>
diff --git a/arch/nios2/core/irq_manage.c b/arch/nios2/core/irq_manage.c
@@ -21,7 +21,7 @@
  */
 
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <kernel_structs.h>
 #include <arch/cpu.h>
 #include <irq.h>
diff --git a/arch/nios2/core/irq_offload.c b/arch/nios2/core/irq_offload.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <kernel_structs.h>
 #include <irq_offload.h>
 
diff --git a/arch/nios2/core/swap.S b/arch/nios2/core/swap.S
@@ -37,7 +37,7 @@ SECTION_FUNC(exception.other, _Swap)
 	movhi r10, %hi(_kernel)
 	ori   r10, r10, %lo(_kernel)
 
-	/* Get the pointer to nanokernel->current */
+	/* Get the pointer to kernel->current */
 	ldw  r11, _kernel_offset_to_current(r10)
 
 	/* Store all the callee saved registers. We either got here via
diff --git a/arch/x86/core/cache.c b/arch/x86/core/cache.c
@@ -20,7 +20,7 @@
  * This module contains functions for manipulation caches.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/util.h>
 #include <toolchain.h>
diff --git a/arch/x86/core/debug/debug_frames.c b/arch/x86/core/debug/debug_frames.c
@@ -22,7 +22,7 @@
  * the current interrupt stack frame.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <kernel_structs.h>
 
 NANO_ISF *sys_debug_current_isf_get(void)
diff --git a/arch/x86/core/fatal.c b/arch/x86/core/fatal.c
@@ -24,7 +24,7 @@
 #include <toolchain.h>
 #include <sections.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <kernel_structs.h>
 #include <misc/printk.h>
 #include <arch/x86/irq_controller.h>
diff --git a/arch/x86/core/irq_manage.c b/arch/x86/core/irq_manage.c
@@ -24,7 +24,7 @@
  * global variable.)
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <kernel_structs.h>
 #include <misc/__assert.h>
diff --git a/arch/x86/core/irq_offload.c b/arch/x86/core/irq_offload.c
@@ -18,7 +18,7 @@
  * @file IRQ offload - x86 implementation
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <irq_offload.h>
 
 extern void (*_irq_sw_handler)(void);
diff --git a/arch/x86/core/reboot_rst_cnt.c b/arch/x86/core/reboot_rst_cnt.c
@@ -20,7 +20,7 @@
  * @details Implements the required 'arch' sub-APIs.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <misc/reboot.h>
 
 static inline void cold_reboot(void)
diff --git a/arch/x86/core/sys_fatal_error_handler.c b/arch/x86/core/sys_fatal_error_handler.c
@@ -22,7 +22,7 @@
  * supported platforms.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <kernel_structs.h>
diff --git a/arch/x86/debug/gdb_arch.c b/arch/x86/debug/gdb_arch.c
diff --git a/arch/x86/soc/atom/soc.c b/arch/x86/soc/atom/soc.c
diff --git a/arch/x86/soc/ia32/soc.c b/arch/x86/soc/ia32/soc.c
diff --git a/arch/x86/soc/intel_quark/quark_se/eoi.c b/arch/x86/soc/intel_quark/quark_se/eoi.c
diff --git a/arch/x86/soc/intel_quark/quark_se/soc.c b/arch/x86/soc/intel_quark/quark_se/soc.c
diff --git a/arch/x86/soc/intel_quark/quark_se/soc_config.c b/arch/x86/soc/intel_quark/quark_se/soc_config.c
diff --git a/arch/x86/soc/intel_quark/quark_x1000/soc.c b/arch/x86/soc/intel_quark/quark_x1000/soc.c
diff --git a/drivers/gpio/gpio_cc32xx.c b/drivers/gpio/gpio_cc32xx.c
diff --git a/drivers/pinmux/stm32/pinmux_board_nucleo_f411re.c b/drivers/pinmux/stm32/pinmux_board_nucleo_f411re.c
diff --git a/misc/reboot.c b/misc/reboot.c
diff --git a/samples/philosophers/README.txt b/samples/philosophers/README.txt
diff --git a/samples/usb/dfu/src/usb_dfu.c b/samples/usb/dfu/src/usb_dfu.c
diff --git a/subsys/debug/gdb_server.c b/subsys/debug/gdb_server.c
diff --git a/subsys/debug/mem_safe_check_boundaries.c b/subsys/debug/mem_safe_check_boundaries.c
