michaelh/zephyr
1
0
Fork 0
Code Releases Activity

build: remove old kernel support

Browse source 
Change-Id: If1d29573a0ad4a863f0058c8b8e2c35f5ced6d9e
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2016-11-07 10:27:45 -08:00
commit 625acd5f4b
3 changed files with 2 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Kbuild
View file

@ -88,21 +88,11 @@ define rule_cc_o_c_1
$(call echo-cmd,cc_o_c_1) $(cmd_cc_o_c_1); $(call echo-cmd,cc_o_c_1) $(cmd_cc_o_c_1);
endef endef
ifeq ($(CONFIG_KERNEL_V2),y)
OFFSETS_INCLUDE_KERNEL_LOCATION=$(strip \
-I $(srctree)/kernel/unified/include \
)
else
OFFSETS_INCLUDE_KERNEL_LOCATION=$(strip \
-I $(srctree)/kernel/microkernel/include \
-I $(srctree)/kernel/nanokernel/include \
)
endif
OFFSETS_INCLUDE = $(strip \ 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 \
$(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 )

6
Makefile
View file

@ -576,13 +576,9 @@ else
include/config/auto.conf: ; include/config/auto.conf: ;
endif # $(dot-config) endif # $(dot-config)
# Unified kernel objects are built as a static library # kernel objects are built as a static library
ifeq ($(CONFIG_KERNEL_V2),y)
libs-y := kernel/unified/ libs-y := kernel/unified/
core-y := lib/ misc/ net/ boards/ ext/ subsys/ tests/ arch/ core-y := lib/ misc/ net/ boards/ ext/ subsys/ tests/ arch/
else
core-y := lib/ kernel/ misc/ net/ boards/ ext/ subsys/ tests/ arch/
endif
drivers-y := drivers/ drivers-y := drivers/
ARCH = $(subst $(DQUOTE),,$(CONFIG_ARCH)) ARCH = $(subst $(DQUOTE),,$(CONFIG_ARCH))

3
misc/generated/sysgen/Makefile
View file

@ -1,6 +1,3 @@
ifneq ($(CONFIG_KERNEL_V2),y)
ccflags-$(CONFIG_MICROKERNEL) += -I$(srctree)/include/microkernel
endif
ccflags-y += -I$(CURDIR)/misc/generated/sysgen ccflags-y += -I$(CURDIR)/misc/generated/sysgen
obj-y = kernel_main.o obj-y = kernel_main.o