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>
9 years ago · d687a95611
48 changed files with 12 additions and 14 deletions
--- a/2
+++ b/2
@ -92,7 +92,7 @@ OFFSETS_INCLUDE = $(strip \
				@@ -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 )
--- a/4
+++ b/4
@ -366,7 +366,7 @@ export ARCH KERNEL_NAME KERNEL_ELF_NAME KERNEL_BIN_NAME KERNEL_HEX_NAME
				@@ -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: ;
				@@ -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/

--- a/arch/arc/core/Makefile
+++ b/arch/arc/core/Makefile
@ -1,4 +1,4 @@
				@@ -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 \
--- a/arch/arm/core/Makefile
+++ b/arch/arm/core/Makefile
@ -1,4 +1,4 @@
				@@ -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 \
--- a/arch/arm/core/cortex_m/Makefile
+++ b/arch/arm/core/cortex_m/Makefile
@ -1,6 +1,6 @@
				@@ -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)

--- a/arch/nios2/core/Makefile
+++ b/arch/nios2/core/Makefile
@ -1,4 +1,4 @@
				@@ -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 \
--- a/arch/x86/core/Makefile
+++ b/arch/x86/core/Makefile
@ -1,5 +1,5 @@
				@@ -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
--- a/kernel/unified/Makefile
+++ b/kernel/unified/Makefile
@ -1,4 +1,4 @@
				@@ -1,4 +1,4 @@
-ccflags-y += -I$(srctree)/kernel/unified/include
+ccflags-y += -I$(srctree)/kernel/include

 asflags-y := ${ccflags-y}

--- a/kernel/unified/alert.c
+++ b/kernel/unified/alert.c
--- a/kernel/unified/atomic_c.c
+++ b/kernel/unified/atomic_c.c
--- a/kernel/unified/compiler_stack_protect.c
+++ b/kernel/unified/compiler_stack_protect.c
--- a/kernel/unified/device.c
+++ b/kernel/unified/device.c
--- a/kernel/unified/errno.c
+++ b/kernel/unified/errno.c
--- a/kernel/unified/event_logger.c
+++ b/kernel/unified/event_logger.c
--- a/kernel/unified/fifo.c
+++ b/kernel/unified/fifo.c
--- a/kernel/unified/idle.c
+++ b/kernel/unified/idle.c
--- a/kernel/unified/include/gen_offset.h
+++ b/kernel/unified/include/gen_offset.h
--- a/kernel/unified/include/kernel_offsets.h
+++ b/kernel/unified/include/kernel_offsets.h
--- a/kernel/unified/include/kernel_structs.h
+++ b/kernel/unified/include/kernel_structs.h
--- a/kernel/unified/include/ksched.h
+++ b/kernel/unified/include/ksched.h
--- a/kernel/unified/include/nano_internal.h
+++ b/kernel/unified/include/nano_internal.h
--- a/kernel/unified/include/offsets_short.h
+++ b/kernel/unified/include/offsets_short.h
--- a/kernel/unified/include/timeout_q.h
+++ b/kernel/unified/include/timeout_q.h
--- a/kernel/unified/include/wait_q.h
+++ b/kernel/unified/include/wait_q.h
--- a/kernel/unified/init.c
+++ b/kernel/unified/init.c
--- a/kernel/unified/int_latency_bench.c
+++ b/kernel/unified/int_latency_bench.c
--- a/kernel/unified/kernel_event_logger.c
+++ b/kernel/unified/kernel_event_logger.c
--- a/kernel/unified/legacy_offload.c
+++ b/kernel/unified/legacy_offload.c
--- a/kernel/unified/legacy_timer.c
+++ b/kernel/unified/legacy_timer.c
--- a/kernel/unified/lifo.c
+++ b/kernel/unified/lifo.c
--- a/kernel/unified/mailbox.c
+++ b/kernel/unified/mailbox.c
--- a/kernel/unified/mem_pool.c
+++ b/kernel/unified/mem_pool.c
--- a/kernel/unified/mem_slab.c
+++ b/kernel/unified/mem_slab.c
--- a/kernel/unified/msg_q.c
+++ b/kernel/unified/msg_q.c
--- a/kernel/unified/mutex.c
+++ b/kernel/unified/mutex.c
--- a/kernel/unified/pipes.c
+++ b/kernel/unified/pipes.c
--- a/kernel/unified/sched.c
+++ b/kernel/unified/sched.c
--- a/kernel/unified/sem.c
+++ b/kernel/unified/sem.c
--- a/kernel/unified/stack.c
+++ b/kernel/unified/stack.c
--- a/kernel/unified/sys_clock.c
+++ b/kernel/unified/sys_clock.c
--- a/kernel/unified/system_work_q.c
+++ b/kernel/unified/system_work_q.c
--- a/kernel/unified/thread.c
+++ b/kernel/unified/thread.c
--- a/kernel/unified/thread_abort.c
+++ b/kernel/unified/thread_abort.c
--- a/kernel/unified/timer.c
+++ b/kernel/unified/timer.c
--- a/kernel/unified/version.c
+++ b/kernel/unified/version.c
--- a/kernel/unified/work_q.c
+++ b/kernel/unified/work_q.c
--- a/samples/philosophers/src/main.c
+++ b/samples/philosophers/src/main.c
@ -17,7 +17,7 @@
				@@ -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
--- a/subsys/net/ip/Kconfig.mgmt
+++ b/subsys/net/ip/Kconfig.mgmt
@ -20,9 +20,7 @@ menuconfig NET_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