kernel: replace all remaining nanokernel occurances

replace include <nanokernel.h> with <kernel.h> everywhere and also fix
any remaining mentions of nanokernel.

Keep the legacy samples/tests as is.

Change-Id: Iac48447bd191e83f21a719c69dc26233216d08dc
Signed-off-by: Anas Nashif <anas.nashif@intel.com>

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/k_idle.c
-F:	kernel/nanokernel/device.c
+F:	kernel/device.c
 F:	samples/power/
 
 QMSI

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>

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

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>

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;

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>

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>

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>

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>
 

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>

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>

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>
 

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>

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

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>
 

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>
 
 /**

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>

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;

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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"
 

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>

arch/nios2/core/cpu_idle.c

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <kernel_structs.h>
 
 /**

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>

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>

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>
 

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

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>

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)

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>

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>

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);

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)

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>

arch/x86/debug/gdb_arch.c

@@ -19,7 +19,7 @@
  * x86 part of the GDB server
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <kernel_structs.h>
 #include <string.h>
 #include <debug/gdb_arch.h>

arch/x86/soc/atom/soc.c

@@ -22,7 +22,7 @@
  * for the ia32 platform.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include "soc.h"
 #include <uart.h>
 #include <device.h>

arch/x86/soc/ia32/soc.c

@@ -22,7 +22,7 @@
  * for the ia32 platform.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include "soc.h"
 #include <uart.h>
 #include <device.h>

arch/x86/soc/intel_quark/quark_se/eoi.c

@@ -24,7 +24,7 @@
  * with the vector of the interrupt.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/x86/irq_controller.h>
 #include <sys_io.h>
 #include <interrupt_controller/ioapic_priv.h>

arch/x86/soc/intel_quark/quark_se/soc.c

@@ -24,7 +24,7 @@
 
 #include <errno.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <misc/printk.h>
 #include <misc/__assert.h>
 #include "soc.h"

arch/x86/soc/intel_quark/quark_se/soc_config.c

@@ -20,7 +20,7 @@
 #include <init.h>
 
 #include "board.h"
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 
 #if CONFIG_IPM_QUARK_SE

arch/x86/soc/intel_quark/quark_x1000/soc.c

@@ -25,7 +25,7 @@
  * Handlers for the secondary serial port have not been added.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <init.h>
 #include <device.h>
 #include <misc/printk.h>

drivers/gpio/gpio_cc32xx.c

@@ -18,7 +18,7 @@
 #include <device.h>
 #include <gpio.h>
 #include <init.h>
-#include <nanokernel.h>
+#include <kernel.h>
 #include <sys_io.h>
 
 /* Driverlib includes */

drivers/pinmux/stm32/pinmux_board_nucleo_f411re.c

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <pinmux.h>

misc/reboot.c

@@ -20,7 +20,7 @@
  * @details See misc/Kconfig and the reboot help for details.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <drivers/system_timer.h>
 #include <misc/printk.h>
 #include <misc/reboot.h>

samples/philosophers/README.txt

@@ -3,9 +3,7 @@ Title: Dining Philosophers
 Description:
 
 An implementation of a solution to the Dining Philosophers problem
-(a classic multi-thread synchronization problem).  This particular
+(a classic multi-thread synchronization problem).
-implementation demonstrates the usage of nanokernel semaphores and
-timers from multiple (6) fibers.
 
 The philosopher always tries to get the lowest fork first (f1 then f2).  When
 done, he will give back the forks in the reverse order (f2 then f1).  If he
@@ -20,7 +18,7 @@ Each Philosopher will randomly alternate between the EATING and THINKING state.
 
 Building and Running Project:
 
-This nanokernel project outputs to the console.  It can be built and executed
+This project outputs to the console.  It can be built and executed
 on QEMU as follows:
 
     make qemu

samples/usb/dfu/src/usb_dfu.c

@@ -37,7 +37,7 @@
  *
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <stdio.h>
 #include <errno.h>
 #include <flash.h>

subsys/debug/gdb_server.c

@@ -324,7 +324,7 @@
  *       %CONFIG_GDB_REMOTE_SERIAL_EXT_NOTIF_PREFIX_STR:<notificationData>#<checksum>
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>

subsys/debug/mem_safe_check_boundaries.c

@@ -21,7 +21,7 @@
  * @details See debug/Kconfig and the "Safe memory access" help for details.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <init.h>
 #include <errno.h>
 #include <toolchain.h>