kernel: move kernel code to kernel/ directly

Also remove mentions of unified kernel in various places in the kernel,
samples and documentation.

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

Kbuild

@@ -92,7 +92,7 @@ OFFSETS_INCLUDE = $(strip \
 		-include $(CURDIR)/include/generated/autoconf.h \
 		-I $(srctree)/include \
 		-I $(CURDIR)/include/generated \
-		-I $(srctree)/kernel/unified/include \
+		-I $(srctree)/kernel/include \
 		$(OFFSETS_INCLUDE_KERNEL_LOCATION) \
 		-I $(srctree)/lib/libc/minimal/include \
 		-I $(srctree)/arch/${ARCH}/include )

Makefile

@@ -366,7 +366,7 @@ export ARCH KERNEL_NAME KERNEL_ELF_NAME KERNEL_BIN_NAME KERNEL_HEX_NAME
 # Use ZEPHYRINCLUDE when you must reference the include/ directory.
 # Needed to be compatible with the O= option
 ZEPHYRINCLUDE    = \
-		-I$(srctree)/kernel/unified/include \
+		-I$(srctree)/kernel/include \
 		-I$(srctree)/arch/$(ARCH)/include \
 		-I$(srctree)/arch/$(ARCH)/soc/$(SOC_PATH) \
 		-I$(srctree)/boards/$(ARCH)/$(BOARD_NAME) \
@@ -592,7 +592,7 @@ include/config/auto.conf: ;
 endif # $(dot-config)
 
 # kernel objects are built as a static library
-libs-y := kernel/unified/
+libs-y := kernel/
 core-y := lib/ misc/ boards/ ext/ subsys/ tests/ arch/
 drivers-y := drivers/
 

arch/arc/core/Makefile

@@ -1,4 +1,4 @@
-ccflags-y += -I$(srctree)/kernel/unified/include
+ccflags-y += -I$(srctree)/kernel/include
 ccflags-y +=-I$(srctree)/arch/$(ARCH)/include
 
 obj-y += thread.o thread_entry_wrapper.o \

arch/arm/core/Makefile

@@ -1,4 +1,4 @@
-ccflags-y += -I$(srctree)/kernel/unified/include
+ccflags-y += -I$(srctree)/kernel/include
 asflags-y := ${ccflags-y}
 
 obj-y = exc_exit.o irq_init.o \

arch/arm/core/cortex_m/Makefile

@@ -1,6 +1,6 @@
 ccflags-y +=-I$(srctree)/include/drivers
 ccflags-y +=-I$(srctree)/arch/arm/soc/$(SOC_PATH)
-ccflags-y +=-I$(srctree)/kernel/unified/include
+ccflags-y +=-I$(srctree)/kernel/include
 
 asflags-y = $(ccflags-y)
 

arch/nios2/core/Makefile

@@ -1,4 +1,4 @@
-ccflags-y += -I$(srctree)/kernel/unified/include
+ccflags-y += -I$(srctree)/kernel/include
 ccflags-y += -I$(srctree)/arch/$(ARCH)/include
 
 obj-y += reset.o irq_manage.o fatal.o swap.o thread.o \

arch/x86/core/Makefile

@@ -1,5 +1,5 @@
-ccflags-y += -I$(srctree)/kernel/unified/include
-asflags-y += -I$(srctree)/kernel/unified/include
+ccflags-y += -I$(srctree)/kernel/include
+asflags-y += -I$(srctree)/kernel/include
 
 ifeq ($(COMPILER)$(CONFIG_X86_IAMCU),clang)
 # We rely on GAS for assembling, so don't use the integrated assembler

kernel/Makefile

@@ -1,4 +1,4 @@
-ccflags-y += -I$(srctree)/kernel/unified/include
+ccflags-y += -I$(srctree)/kernel/include
 
 asflags-y := ${ccflags-y}
 

samples/philosophers/src/main.c

@@ -17,7 +17,7 @@
 /**
  * @file
  *
- * Dining philosophers demo for unified kernel.
+ * Dining philosophers demo
  *
  * The demo can be configured to use different object types for its
  * synchronization: SEMAPHORES, MUTEXES, STACKS, FIFOS and LIFOS. To configure

subsys/net/ip/Kconfig.mgmt

@@ -20,9 +20,7 @@ menuconfig NET_MGMT
 	help
 	Add support for NM API that enables managing different aspects
 	of the network stack as well as receiving notification on network
-	events (ip address change, iface up and running ...). Beware this
-	requires the new unified kernel (KERNEL_V2) and cannot be used in
-	former nanokernel.
+	events (ip address change, iface up and running ...).
 
 if NET_MGMT