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>

48 files changed, 12 insertions, 14 deletions

diff --git a/Kbuild b/Kbuild
index 539b5e4cf..ba9a09c57 100644
--- a/Kbuild
+++ b/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 )
diff --git a/Makefile b/Makefile
index 16f5ddde7..0ed598b5f 100644
--- a/Makefile
+++ b/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/
 
diff --git a/arch/arc/core/Makefile b/arch/arc/core/Makefile
index 0fe47d0f6..bc16184b0 100644
--- a/arch/arc/core/Makefile
+++ b/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 \
diff --git a/arch/arm/core/Makefile b/arch/arm/core/Makefile
index 18d8b1023..f738f43f8 100644
--- a/arch/arm/core/Makefile
+++ b/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 \
diff --git a/arch/arm/core/cortex_m/Makefile b/arch/arm/core/cortex_m/Makefile
index dd2bf98ee..a671b28f9 100644
--- a/arch/arm/core/cortex_m/Makefile
+++ b/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)
 
diff --git a/arch/nios2/core/Makefile b/arch/nios2/core/Makefile
index e0a9fd906..6ef0ce023 100644
--- a/arch/nios2/core/Makefile
+++ b/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 \
diff --git a/arch/x86/core/Makefile b/arch/x86/core/Makefile
index b7d5a62d2..2f1e78fbc 100644
--- a/arch/x86/core/Makefile
+++ b/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
diff --git a/kernel/unified/Makefile b/kernel/Makefile
index 78f50ad08..6a4f6e855 100644
--- a/kernel/unified/Makefile
+++ b/kernel/Makefile
@@ -1,4 +1,4 @@
-ccflags-y += -I$(srctree)/kernel/unified/include
+ccflags-y += -I$(srctree)/kernel/include
 
 asflags-y := ${ccflags-y}
 
diff --git a/kernel/unified/alert.c b/kernel/alert.c
index 2e42ba4fa..2e42ba4fa 100644
--- a/kernel/unified/alert.c
+++ b/kernel/alert.c
diff --git a/kernel/unified/atomic_c.c b/kernel/atomic_c.c
index b8f2a19bf..b8f2a19bf 100644
--- a/kernel/unified/atomic_c.c
+++ b/kernel/atomic_c.c
diff --git a/kernel/unified/compiler_stack_protect.c b/kernel/compiler_stack_protect.c
index d47b7af83..d47b7af83 100644
--- a/kernel/unified/compiler_stack_protect.c
+++ b/kernel/compiler_stack_protect.c
diff --git a/kernel/unified/device.c b/kernel/device.c
index 65d3616d0..65d3616d0 100644
--- a/kernel/unified/device.c
+++ b/kernel/device.c
diff --git a/kernel/unified/errno.c b/kernel/errno.c
index 9305faba4..9305faba4 100644
--- a/kernel/unified/errno.c
+++ b/kernel/errno.c
diff --git a/kernel/unified/event_logger.c b/kernel/event_logger.c
index eb9366c3a..eb9366c3a 100644
--- a/kernel/unified/event_logger.c
+++ b/kernel/event_logger.c
diff --git a/kernel/unified/fifo.c b/kernel/fifo.c
index fa7e5e64b..fa7e5e64b 100644
--- a/kernel/unified/fifo.c
+++ b/kernel/fifo.c
diff --git a/kernel/unified/idle.c b/kernel/idle.c
index 13b729bdb..13b729bdb 100644
--- a/kernel/unified/idle.c
+++ b/kernel/idle.c
diff --git a/kernel/unified/include/gen_offset.h b/kernel/include/gen_offset.h
index 9b8286da6..9b8286da6 100644
--- a/kernel/unified/include/gen_offset.h
+++ b/kernel/include/gen_offset.h
diff --git a/kernel/unified/include/kernel_offsets.h b/kernel/include/kernel_offsets.h
index 73553c007..73553c007 100644
--- a/kernel/unified/include/kernel_offsets.h
+++ b/kernel/include/kernel_offsets.h
diff --git a/kernel/unified/include/kernel_structs.h b/kernel/include/kernel_structs.h
index c82fc61a5..c82fc61a5 100644
--- a/kernel/unified/include/kernel_structs.h
+++ b/kernel/include/kernel_structs.h
diff --git a/kernel/unified/include/ksched.h b/kernel/include/ksched.h
index 6816c1e66..6816c1e66 100644
--- a/kernel/unified/include/ksched.h
+++ b/kernel/include/ksched.h
diff --git a/kernel/unified/include/nano_internal.h b/kernel/include/nano_internal.h
index 5396133a3..5396133a3 100644
--- a/kernel/unified/include/nano_internal.h
+++ b/kernel/include/nano_internal.h
diff --git a/kernel/unified/include/offsets_short.h b/kernel/include/offsets_short.h
index 32918648f..32918648f 100644
--- a/kernel/unified/include/offsets_short.h
+++ b/kernel/include/offsets_short.h
diff --git a/kernel/unified/include/timeout_q.h b/kernel/include/timeout_q.h
index 731effc10..731effc10 100644
--- a/kernel/unified/include/timeout_q.h
+++ b/kernel/include/timeout_q.h
diff --git a/kernel/unified/include/wait_q.h b/kernel/include/wait_q.h
index df6538694..df6538694 100644
--- a/kernel/unified/include/wait_q.h
+++ b/kernel/include/wait_q.h
diff --git a/kernel/unified/init.c b/kernel/init.c
index 8b14c73af..8b14c73af 100644
--- a/kernel/unified/init.c
+++ b/kernel/init.c
diff --git a/kernel/unified/int_latency_bench.c b/kernel/int_latency_bench.c
index cdb3b0980..cdb3b0980 100644
--- a/kernel/unified/int_latency_bench.c
+++ b/kernel/int_latency_bench.c
diff --git a/kernel/unified/kernel_event_logger.c b/kernel/kernel_event_logger.c
index 9986f3759..9986f3759 100644
--- a/kernel/unified/kernel_event_logger.c
+++ b/kernel/kernel_event_logger.c
diff --git a/kernel/unified/legacy_offload.c b/kernel/legacy_offload.c
index 007c1d44c..007c1d44c 100644
--- a/kernel/unified/legacy_offload.c
+++ b/kernel/legacy_offload.c
diff --git a/kernel/unified/legacy_timer.c b/kernel/legacy_timer.c
index d7b528952..d7b528952 100644
--- a/kernel/unified/legacy_timer.c
+++ b/kernel/legacy_timer.c
diff --git a/kernel/unified/lifo.c b/kernel/lifo.c
index 4cd5a116c..4cd5a116c 100644
--- a/kernel/unified/lifo.c
+++ b/kernel/lifo.c
diff --git a/kernel/unified/mailbox.c b/kernel/mailbox.c
index c26aaa830..c26aaa830 100644
--- a/kernel/unified/mailbox.c
+++ b/kernel/mailbox.c
diff --git a/kernel/unified/mem_pool.c b/kernel/mem_pool.c
index f3a34847a..f3a34847a 100644
--- a/kernel/unified/mem_pool.c
+++ b/kernel/mem_pool.c
diff --git a/kernel/unified/mem_slab.c b/kernel/mem_slab.c
index 486d2b6f4..486d2b6f4 100644
--- a/kernel/unified/mem_slab.c
+++ b/kernel/mem_slab.c
diff --git a/kernel/unified/msg_q.c b/kernel/msg_q.c
index 684953c58..684953c58 100644
--- a/kernel/unified/msg_q.c
+++ b/kernel/msg_q.c
diff --git a/kernel/unified/mutex.c b/kernel/mutex.c
index ddf702520..ddf702520 100644
--- a/kernel/unified/mutex.c
+++ b/kernel/mutex.c
diff --git a/kernel/unified/pipes.c b/kernel/pipes.c
index 6a69061b9..6a69061b9 100644
--- a/kernel/unified/pipes.c
+++ b/kernel/pipes.c
diff --git a/kernel/unified/sched.c b/kernel/sched.c
index 2755d8101..2755d8101 100644
--- a/kernel/unified/sched.c
+++ b/kernel/sched.c
diff --git a/kernel/unified/sem.c b/kernel/sem.c
index 80ac3e89a..80ac3e89a 100644
--- a/kernel/unified/sem.c
+++ b/kernel/sem.c
diff --git a/kernel/unified/stack.c b/kernel/stack.c
index 1b86aa82f..1b86aa82f 100644
--- a/kernel/unified/stack.c
+++ b/kernel/stack.c
diff --git a/kernel/unified/sys_clock.c b/kernel/sys_clock.c
index 9108c0191..9108c0191 100644
--- a/kernel/unified/sys_clock.c
+++ b/kernel/sys_clock.c
diff --git a/kernel/unified/system_work_q.c b/kernel/system_work_q.c
index 6236c6186..6236c6186 100644
--- a/kernel/unified/system_work_q.c
+++ b/kernel/system_work_q.c
diff --git a/kernel/unified/thread.c b/kernel/thread.c
index 030f415ac..030f415ac 100644
--- a/kernel/unified/thread.c
+++ b/kernel/thread.c
diff --git a/kernel/unified/thread_abort.c b/kernel/thread_abort.c
index 289b5e7c7..289b5e7c7 100644
--- a/kernel/unified/thread_abort.c
+++ b/kernel/thread_abort.c
diff --git a/kernel/unified/timer.c b/kernel/timer.c
index f6a803a3e..f6a803a3e 100644
--- a/kernel/unified/timer.c
+++ b/kernel/timer.c
diff --git a/kernel/unified/version.c b/kernel/version.c
index c33fb7aa8..c33fb7aa8 100644
--- a/kernel/unified/version.c
+++ b/kernel/version.c
diff --git a/kernel/unified/work_q.c b/kernel/work_q.c
index 8c29270ca..8c29270ca 100644
--- a/kernel/unified/work_q.c
+++ b/kernel/work_q.c
diff --git a/samples/philosophers/src/main.c b/samples/philosophers/src/main.c
index d2bc79e37..778eedcea 100644
--- a/samples/philosophers/src/main.c
+++ b/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
diff --git a/subsys/net/ip/Kconfig.mgmt b/subsys/net/ip/Kconfig.mgmt
index f698eb425..6308a8526 100644
--- a/subsys/net/ip/Kconfig.mgmt
+++ b/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