michaelh/zephyr
1
0
Fork 0
Code Releases Activity

build: force all kernel builds to be Unified kernel

Browse source 
KERNEL_TYPE build parameter is now ignored.

Change-Id: I7523f14ff674ef8b8e24246e5f71111df81cf7df
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2016-11-03 11:51:53 -07:00
commit c2de216154
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Makefile.inc
View file

@ -44,7 +44,6 @@ endif
export ARCH MDEF_FILE QEMU_EXTRA_FLAGS PROJECT_BASE
KERNEL_TYPE ?= micro
override CONF_FILE := $(strip $(subst $(DQUOTE),,$(CONF_FILE)))
SOURCE_DIR ?= $(PROJECT_BASE)/src/
@ -132,7 +131,7 @@ help:
%:
$(Q)$(call zephyrmake,$(O),$@)
KERNEL_CONFIG = $(ZEPHYR_BASE)/kernel/configs/$(KERNEL_TYPE).config
KERNEL_CONFIG = $(ZEPHYR_BASE)/kernel/configs/unified.config
$(DOTCONFIG): $(BOARDCONFIG) $(KBUILD_DEFCONFIG_PATH) $(CONF_FILE)
$(Q)$(CONFIG_SHELL) $(ZEPHYR_BASE)/scripts/kconfig/merge_config.sh \