Makefile: do not define default BOARD/SCENARIO in top-level Makefile
The top-level Makefile should not define any default value as the hypervisor may have its own configurations set by previous builds. This patch also changes the hypervisor default RELEASE to `n`. Tracked-On: #5772 Signed-off-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
parent
d5c11d5e79
commit
22064f71c1
10
Makefile
10
Makefile
|
@ -63,16 +63,6 @@ else
|
|||
endif
|
||||
endif
|
||||
|
||||
BOARD ?= kbl-nuc-i7
|
||||
|
||||
ifeq ($(BOARD), apl-nuc)
|
||||
override BOARD := nuc6cayh
|
||||
else ifeq ($(BOARD), kbl-nuc-i7)
|
||||
override BOARD := nuc7i7dnb
|
||||
endif
|
||||
|
||||
SCENARIO ?= industry
|
||||
|
||||
O ?= build
|
||||
ROOT_OUT := $(shell mkdir -p $(O);cd $(O);pwd)
|
||||
HV_OUT := $(ROOT_OUT)/hypervisor
|
||||
|
|
|
@ -141,6 +141,13 @@ ifdef RELEASE
|
|||
endif
|
||||
endif
|
||||
|
||||
# Backward-compatibility for BOARD=apl-nuc or BOARD=kbl-nuc
|
||||
ifeq ($(BOARD), apl-nuc)
|
||||
override BOARD := nuc6cayh
|
||||
else ifeq ($(BOARD), kbl-nuc-i7)
|
||||
override BOARD := nuc7i7dnb
|
||||
endif
|
||||
|
||||
ifeq ($(findstring $(MAKECMDGOALS),distclean),)
|
||||
-include $(HV_CONFIG_MK)
|
||||
endif
|
||||
|
@ -181,7 +188,7 @@ endif
|
|||
|
||||
$(eval $(call determine_config,BOARD,nuc7i7dnb))
|
||||
$(eval $(call determine_config,SCENARIO,industry))
|
||||
$(eval $(call determine_build_type,y))
|
||||
$(eval $(call determine_build_type,n))
|
||||
|
||||
$(HV_BOARD_XML):
|
||||
@if [ ! -f $(HV_BOARD_XML) ]; then \
|
||||
|
|
Loading…
Reference in New Issue