github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-02 09:25:17 +00:00
Code Issues Projects Releases Wiki Activity

Kconfig: change scenario variable type to string

Browse Source 
Basicly ACRN scenario is a configuration name for specific usage. By giving
scenario name ACRN will load corresponding VM configurations to build the
hypervisor. But customer might have their own scenario name, change the
scenario type from choice to string is friendly to them since Kconfig source
file change will not be needed.

With this change, CONFIG_$(SCENARIO) will not exist in kconfig file and will
be instead of CONFIG_SCENARIO, so the Makefile need to be changed accordingly;

Tracked-On: #4616

Signed-off-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Victor Sun
2020-04-13 09:47:26 +08:00
committed by wenlingz
parent 7282b933fb
commit dba0591f72
4 changed files with 34 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
hypervisor/Makefile
View File

@@ -50,31 +50,11 @@ include scripts/makefile/deps.mk
include scripts/makefile/kconfig.mk
#initialize BOARD if it is not specified
ifeq ($(BOARD),)
override BOARD := $(CONFIG_BOARD)
endif
#override BOARD from CONFIG_BOARD, which is specified in kconfig.mk
override BOARD := $(shell echo $(CONFIG_BOARD) |sed 's/"//g')
ifeq ($(CONFIG_SDC),y)
KCONFIG_SCENARIO := sdc
else ifeq ($(CONFIG_SDC2),y)
KCONFIG_SCENARIO := sdc2
else ifeq ($(CONFIG_LOGICAL_PARTITION),y)
KCONFIG_SCENARIO := logical_partition
else ifeq ($(CONFIG_INDUSTRY),y)
KCONFIG_SCENARIO := industry
else ifeq ($(CONFIG_HYBRID),y)
KCONFIG_SCENARIO := hybrid
endif
#initialize SCENARIO if it is not specified
ifeq ($(SCENARIO),)
ifeq ($(KCONFIG_SCENARIO),)
override SCENARIO := sdc
else
override SCENARIO := $(KCONFIG_SCENARIO)
endif
endif
#override SCENARIO from CONFIG_SCENARIO, which is specified in kconfig.mk
override SCENARIO := $(shell echo $(CONFIG_SCENARIO) |sed 's/"//g')
ifeq ($(TARGET_DIR),)
BOARD_CFG_DIR := arch/x86/configs/$(BOARD)
@@ -514,6 +494,8 @@ distclean:
PHONY: (VERSION)
$(VERSION):
@if [ "$(SCENARIO)" = "" ]; then echo "Please specify SCENARIO for the build!"; exit 1; fi;
@if [ "$(BOARD)" = "" ]; then echo "Please specify BOARD for the build!"; exit 1; fi;
@echo "SCENARIO <$(SCENARIO)> for BOARD <$(BOARD)> is specified."
@if [ ! -d $(BOARD_CFG_DIR) ]; then \
echo "Configurations for BOARD $(BOARD) is not found."; exit 1; \