Skip to content

Commit

Permalink
build: remove old kernel support
Browse files Browse the repository at this point in the history
Change-Id: If1d29573a0ad4a863f0058c8b8e2c35f5ced6d9e
Signed-off-by: Andrew Boie <[email protected]>
  • Loading branch information
Andrew Boie committed Nov 7, 2016
1 parent 6450aa4 commit 625acd5
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 19 deletions.
12 changes: 1 addition & 11 deletions Kbuild
Original file line number Diff line number Diff line change
Expand Up @@ -88,21 +88,11 @@ define rule_cc_o_c_1
$(call echo-cmd,cc_o_c_1) $(cmd_cc_o_c_1);
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 \
-include $(CURDIR)/include/generated/autoconf.h \
-I $(srctree)/include \
-I $(CURDIR)/include/generated \
-I $(srctree)/kernel/unified/include \
$(OFFSETS_INCLUDE_KERNEL_LOCATION) \
-I $(srctree)/lib/libc/minimal/include \
-I $(srctree)/arch/${ARCH}/include )
Expand Down
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -576,13 +576,9 @@ else
include/config/auto.conf: ;
endif # $(dot-config)

# Unified kernel objects are built as a static library
ifeq ($(CONFIG_KERNEL_V2),y)
# kernel objects are built as a static library
libs-y := kernel/unified/
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/

ARCH = $(subst $(DQUOTE),,$(CONFIG_ARCH))
Expand Down
3 changes: 0 additions & 3 deletions misc/generated/sysgen/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
ifneq ($(CONFIG_KERNEL_V2),y)
ccflags-$(CONFIG_MICROKERNEL) += -I$(srctree)/include/microkernel
endif
ccflags-y += -I$(CURDIR)/misc/generated/sysgen

obj-y = kernel_main.o

0 comments on commit 625acd5

Please sign in to comment.