michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel: move kernel code to kernel/ directly

Browse source 
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>
This commit is contained in:
Anas Nashif 2016-12-17 17:48:47 -05:00
commit d687a95611
48 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kbuild
View file

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

4
Makefile
View file

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

2
arch/arc/core/Makefile
View file

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

2
arch/arm/core/Makefile
View file

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

2
arch/arm/core/cortex_m/Makefile
View file

@ -1,6 +1,6 @@
ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/include/drivers
ccflags-y +=-I$(srctree)/arch/arm/soc/$(SOC_PATH) 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) asflags-y = $(ccflags-y)

2
arch/nios2/core/Makefile
View file

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

4
arch/x86/core/Makefile
View file

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

2
kernel/unified/Makefile → kernel/Makefile
View file

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

0
kernel/unified/alert.c → kernel/alert.c
View file

0
kernel/unified/atomic_c.c → kernel/atomic_c.c
View file

0
kernel/unified/compiler_stack_protect.c → kernel/compiler_stack_protect.c
View file

0
kernel/unified/device.c → kernel/device.c
View file

0
kernel/unified/errno.c → kernel/errno.c
View file

0
kernel/unified/event_logger.c → kernel/event_logger.c
View file

0
kernel/unified/fifo.c → kernel/fifo.c
View file

0
kernel/unified/idle.c → kernel/idle.c
View file

0
kernel/unified/include/gen_offset.h → kernel/include/gen_offset.h
View file

0
kernel/unified/include/kernel_offsets.h → kernel/include/kernel_offsets.h
View file

0
kernel/unified/include/kernel_structs.h → kernel/include/kernel_structs.h
View file

0
kernel/unified/include/ksched.h → kernel/include/ksched.h
View file

0
kernel/unified/include/nano_internal.h → kernel/include/nano_internal.h
View file

0
kernel/unified/include/offsets_short.h → kernel/include/offsets_short.h
View file

0
kernel/unified/include/timeout_q.h → kernel/include/timeout_q.h
View file

0
kernel/unified/include/wait_q.h → kernel/include/wait_q.h
View file

0
kernel/unified/init.c → kernel/init.c
View file

0
kernel/unified/int_latency_bench.c → kernel/int_latency_bench.c
View file

0
kernel/unified/kernel_event_logger.c → kernel/kernel_event_logger.c
View file

0
kernel/unified/legacy_offload.c → kernel/legacy_offload.c
View file

0
kernel/unified/legacy_timer.c → kernel/legacy_timer.c
View file

0
kernel/unified/lifo.c → kernel/lifo.c
View file

0
kernel/unified/mailbox.c → kernel/mailbox.c
View file

0
kernel/unified/mem_pool.c → kernel/mem_pool.c
View file

0
kernel/unified/mem_slab.c → kernel/mem_slab.c
View file

0
kernel/unified/msg_q.c → kernel/msg_q.c
View file

0
kernel/unified/mutex.c → kernel/mutex.c
View file

0
kernel/unified/pipes.c → kernel/pipes.c
View file

0
kernel/unified/sched.c → kernel/sched.c
View file

0
kernel/unified/sem.c → kernel/sem.c
View file

0
kernel/unified/stack.c → kernel/stack.c
View file

0
kernel/unified/sys_clock.c → kernel/sys_clock.c
View file

0
kernel/unified/system_work_q.c → kernel/system_work_q.c
View file

0
kernel/unified/thread.c → kernel/thread.c
View file

0
kernel/unified/thread_abort.c → kernel/thread_abort.c
View file

0
kernel/unified/timer.c → kernel/timer.c
View file

0
kernel/unified/version.c → kernel/version.c
View file

0
kernel/unified/work_q.c → kernel/work_q.c
View file

2
samples/philosophers/src/main.c
View file

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

4
subsys/net/ip/Kconfig.mgmt
View file

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