OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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:
Junjie Mao 2021-02-28 11:21:35 +08:00 committed by wenlingz
parent d5c11d5e79
commit 22064f71c1
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -63,16 +63,6 @@ else
endif endif
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 O ?= build
ROOT_OUT := $(shell mkdir -p $(O);cd $(O);pwd) ROOT_OUT := $(shell mkdir -p $(O);cd $(O);pwd)
HV_OUT := $(ROOT_OUT)/hypervisor HV_OUT := $(ROOT_OUT)/hypervisor

9
hypervisor/scripts/makefile/config.mk
View File

@ -141,6 +141,13 @@ ifdef RELEASE
endif endif
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),) ifeq ($(findstring $(MAKECMDGOALS),distclean),)
-include $(HV_CONFIG_MK) -include $(HV_CONFIG_MK)
endif endif
@ -181,7 +188,7 @@ endif
$(eval $(call determine_config,BOARD,nuc7i7dnb)) $(eval $(call determine_config,BOARD,nuc7i7dnb))
$(eval $(call determine_config,SCENARIO,industry)) $(eval $(call determine_config,SCENARIO,industry))
$(eval $(call determine_build_type,y)) $(eval $(call determine_build_type,n))
$(HV_BOARD_XML): $(HV_BOARD_XML):
@if [ ! -f $(HV_BOARD_XML) ]; then \ @if [ ! -f $(HV_BOARD_XML) ]; then \