From a57a4fd7fbdfe71293023c303f776ce48996850c Mon Sep 17 00:00:00 2001 From: Victor Sun Date: Wed, 15 Jul 2020 16:40:24 +0800 Subject: [PATCH] HV: Make: enable build for new configs layout The make command is same as old configs layout: under acrn-hypervisor folder: make hypervisor BOARD=xxx SCENARIO=xxx [TARGET_DIR]=xxx [RELEASE=x] under hypervisor folder: make BOARD=xxx SCENARIO=xxx [TARGET_DIR]=xxx [RELEASE=x] if BOARD/SCENARIO parameter is not specified, the default will be: BOARD=nuc7i7dnb SCENARIO=industry Tracked-On: #5077 Signed-off-by: Victor Sun Reviewed-by: Jason Chen CJ Acked-by: Eddie Dong --- Makefile | 48 ++++++++++--------- hypervisor/Makefile | 36 +++++++------- hypervisor/arch/x86/Kconfig | 2 +- hypervisor/boot/include/acpi.h | 3 +- hypervisor/include/arch/x86/board.h | 2 +- hypervisor/include/arch/x86/vm_config.h | 1 + hypervisor/scripts/makefile/cfg_update.mk | 8 +--- hypervisor/scripts/makefile/kconfig.mk | 19 ++++---- misc/acrn-config/kconfig/defconfig.py | 3 +- misc/acrn-config/kconfig/silentoldconfig.py | 3 +- .../logical_partition/nuc7i7dnb/misc_cfg.h | 3 ++ 11 files changed, 69 insertions(+), 59 deletions(-) diff --git a/Makefile b/Makefile index 7dbc6820c..157ebabf8 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,6 @@ # global helper variables T := $(CURDIR) -# $(TARGET_DIR) must be relative path under $(T) TARGET_DIR ?= # BOARD/SCENARIO/BOARD_FILE/SCENARIO_FILE/KCONFIG_FILE parameters sanity check: @@ -44,12 +43,15 @@ ifneq ($(BOARD)$(SCENARIO),) endif endif -ifeq ($(BOARD_FILE)$(SCENARIO_FILE),) - ifneq ($(TARGET_DIR),) - ifneq ($(TARGET_DIR), $(wildcard $(TARGET_DIR))) +ifneq ($(TARGET_DIR),) + CFG_DIR := $(realpath $(TARGET_DIR)) + ifeq ($(CFG_DIR),) + ifeq ($(BOARD_FILE)$(SCENARIO_FILE),) $(error TARGET_DIR $(TARGET_DIR) does not exist) endif endif + + override TARGET_DIR := $(abspath $(TARGET_DIR)) endif ifneq ($(BOARD_FILE)$(SCENARIO_FILE),) @@ -95,6 +97,12 @@ endif BOARD ?= kbl-nuc-i7 +ifeq ($(BOARD), apl-nuc) + override BOARD := nuc6cayh +else ifeq ($(BOARD), kbl-nuc-i7) + override BOARD := nuc7i7dnb +endif + ifneq (,$(filter $(BOARD),apl-mrb)) FIRMWARE ?= sbl else @@ -112,9 +120,10 @@ TOOLS_OUT := $(ROOT_OUT)/misc/tools DOC_OUT := $(ROOT_OUT)/doc BUILD_VERSION ?= BUILD_TAG ?= -GENED_ACPI_INFO_HEADER = $(T)/hypervisor/arch/x86/configs/$(BOARD)/$(BOARD)_acpi_info.h HV_CFG_LOG = $(HV_OUT)/cfg.log -DEFAULT_DEFCONFIG_DIR = $(T)/hypervisor/arch/x86/configs +VM_CONFIGS_DIR = $(T)/misc/vm_configs +DEFCONFIG_FILE = scenarios/$(SCENARIO)/$(BOARD)/$(BOARD).config +GENED_ACPI_INFO_HEADER = $(VM_CONFIGS_DIR)/boards/$(BOARD)/$(BOARD)_acpi_info.h export TOOLS_OUT BOARD SCENARIO FIRMWARE RELEASE @@ -122,12 +131,6 @@ export TOOLS_OUT BOARD SCENARIO FIRMWARE RELEASE all: hypervisor devicemodel tools @cat $(HV_CFG_LOG) -ifeq ($(BOARD), apl-nuc) - override BOARD := nuc6cayh -else ifeq ($(BOARD), kbl-nuc-i7) - override BOARD := nuc7i7dnb -endif - include $(T)/hypervisor/scripts/makefile/cfg_update.mk #help functions to build acrn and install acrn/acrn symbols @@ -160,9 +163,9 @@ hypervisor: @if [ "$(BOARD_FILE)" != "" ] && [ -f $(BOARD_FILE) ] && [ "$(SCENARIO_FILE)" != "" ] && [ -f $(SCENARIO_FILE) ] && [ "$(TARGET_DIR)" = "" ]; then \ echo "No TARGET_DIR parameter is specified, the original configuration source is overwritten!";\ fi - $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) TARGET_DIR=$(abspath $(TARGET_DIR)) defconfig; - $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) TARGET_DIR=$(abspath $(TARGET_DIR)) oldconfig; - $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) TARGET_DIR=$(abspath $(TARGET_DIR)) + $(MAKE) -C $(T)/hypervisor BOARD=$(BOARD) HV_OBJDIR=$(HV_OUT) BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) TARGET_DIR=$(TARGET_DIR) defconfig; + $(MAKE) -C $(T)/hypervisor BOARD=$(BOARD) HV_OBJDIR=$(HV_OUT) BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) TARGET_DIR=$(TARGET_DIR) oldconfig; + $(MAKE) -C $(T)/hypervisor BOARD=$(BOARD) HV_OBJDIR=$(HV_OUT) BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) TARGET_DIR=$(TARGET_DIR) #ifeq ($(FIRMWARE),uefi) @if [ "$(SCENARIO)" != "logical_partition" ] && [ "$(SCENARIO)" != "hybrid" ]; then \ echo "building hypervisor as EFI executable..."; \ @@ -175,21 +178,22 @@ hypervisor: if [ -f $(KCONFIG_FILE) ]; then \ echo -e "Hypervisor configuration is based on:\n\tKconfig file:\t$(KCONFIG_FILE);" >> $(HV_CFG_LOG); \ fi; \ + echo -e "Hypervisor configuration is based on:" >> $(HV_CFG_LOG); \ if [ "$(TARGET_DIR)" = "" ]; then \ if [ ! -f $(KCONFIG_FILE) ]; then \ - echo -e "Hypervisor configuration is based on:\n\t$(BOARD) " \ - "defconfig file:\t$(DEFAULT_DEFCONFIG_DIR)/$(BOARD).config;" >> $(HV_CFG_LOG); \ + echo -e "\tdefconfig file:\t\t\t$(VM_CONFIGS_DIR)/$(DEFCONFIG_FILE);" >> $(HV_CFG_LOG); \ fi; \ elif [ ! -f $(KCONFIG_FILE) ]; then \ - echo -e "Hypervisor configuration is based on:\n\t$(BOARD) " \ - "defconfig file:\t$(abspath $(TARGET_DIR))/$(BOARD).config;" >> $(HV_CFG_LOG); \ + echo -e "\tdefconfig file:\t\t\t$(TARGET_DIR)/$(DEFCONFIG_FILE);" >> $(HV_CFG_LOG); \ fi; \ echo -e "\tOthers are set by default in:\t$(T)/hypervisor/arch/x86/Kconfig;" >> $(HV_CFG_LOG); \ + echo -e "VM configuration is based on:" >> $(HV_CFG_LOG); \ if [ "$(CONFIG_XML_ENABLED)" = "true" ]; then \ - echo -e "VM configuration is based on:\n\tBOARD File:\t$(BOARD_FILE);" \ - "\n\tSCENARIO File:\t$(SCENARIO_FILE);" >> $(HV_CFG_LOG); \ + echo -e "\tBOARD File:\t\t$(BOARD_FILE);\n\t\tSCENARIO File:\t$(SCENARIO_FILE);" >> $(HV_CFG_LOG); \ + elif [ "$(TARGET_DIR)" = "" ]; then \ + echo -e "\tSource code at:\t\t\t$(VM_CONFIGS_DIR)" >> $(HV_CFG_LOG); \ else \ - echo "VM configuration is based on current code base;" >> $(HV_CFG_LOG); \ + echo -e "\tSource code at:\t\t\t$(TARGET_DIR)" >> $(HV_CFG_LOG); \ fi; \ if [ -f $(GENED_ACPI_INFO_HEADER) ] && [ "$(CONFIG_XML_ENABLED)" != "true" ] && [ "TARGET_DIR" = "" ]; then \ echo -e "\033[33mWarning: The platform ACPI info is based on acrn-config generated $(GENED_ACPI_INFO_HEADER), please make sure its validity.\033[0m" >> $(HV_CFG_LOG); \ diff --git a/hypervisor/Makefile b/hypervisor/Makefile index 58a068edc..14ad7fe3a 100644 --- a/hypervisor/Makefile +++ b/hypervisor/Makefile @@ -19,6 +19,10 @@ HV_OBJDIR ?= $(CURDIR)/build HV_MODDIR ?= $(HV_OBJDIR)/modules HV_FILE := acrn +ifeq ($(TARGET_DIR),) + override TARGET_DIR := $(realpath ../misc/vm_configs) +endif + LIB_MOD = $(HV_MODDIR)/lib_mod.a BOOT_MOD = $(HV_MODDIR)/boot_mod.a HW_MOD = $(HV_MODDIR)/hw_mod.a @@ -55,13 +59,9 @@ override BOARD := $(shell echo $(CONFIG_BOARD) |sed 's/"//g') #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) - SCENARIO_CFG_DIR := scenarios/$(SCENARIO) -else - BOARD_CFG_DIR := $(TARGET_DIR)/$(BOARD) - SCENARIO_CFG_DIR := $(TARGET_DIR)/$(SCENARIO) -endif +BOARD_INFO_DIR := $(TARGET_DIR)/boards/$(BOARD) +SCENARIO_CFG_DIR := $(TARGET_DIR)/scenarios/$(SCENARIO) +BOARD_CFG_DIR := $(SCENARIO_CFG_DIR)/$(BOARD) include ../paths.make @@ -162,6 +162,7 @@ INCLUDE_PATH += include/hw INCLUDE_PATH += boot/include INCLUDE_PATH += boot/include/guest INCLUDE_PATH += $(HV_OBJDIR)/include +INCLUDE_PATH += $(BOARD_INFO_DIR) INCLUDE_PATH += $(BOARD_CFG_DIR) INCLUDE_PATH += $(SCENARIO_CFG_DIR) @@ -250,11 +251,6 @@ HW_C_SRCS += common/sched_bvt.c endif HW_C_SRCS += hw/pci.c HW_C_SRCS += arch/x86/configs/vm_config.c -HW_C_SRCS += $(BOARD_CFG_DIR)/board.c -HW_C_SRCS += $(SCENARIO_CFG_DIR)/vm_configurations.c -ifneq (,$(wildcard $(SCENARIO_CFG_DIR)/pci_dev.c)) -HW_C_SRCS += $(SCENARIO_CFG_DIR)/pci_dev.c -endif HW_C_SRCS += boot/acpi_base.c HW_C_SRCS += boot/cmdline.c # ACPI parsing component @@ -267,6 +263,13 @@ HW_C_SRCS += boot/guest/vboot_wrapper.c HW_C_SRCS += boot/guest/deprivilege_boot.c HW_C_SRCS += boot/guest/direct_boot.c +# VM Configuration +VM_CFG_C_SRCS += $(BOARD_INFO_DIR)/board.c +VM_CFG_C_SRCS += $(SCENARIO_CFG_DIR)/vm_configurations.c +ifneq (,$(wildcard $(BOARD_CFG_DIR)/pci_dev.c)) +VM_CFG_C_SRCS += $(BOARD_CFG_DIR)/pci_dev.c +endif + # virtual platform base component VP_BASE_C_SRCS += arch/x86/guest/vcpuid.c VP_BASE_C_SRCS += arch/x86/guest/vcpu.c @@ -335,6 +338,7 @@ BOOT_C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(BOOT_C_SRCS)) BOOT_S_OBJS := $(patsubst %.S,$(HV_OBJDIR)/%.o,$(BOOT_S_SRCS)) HW_C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(HW_C_SRCS)) HW_S_OBJS := $(patsubst %.S,$(HV_OBJDIR)/%.o,$(HW_S_SRCS)) +VM_CFG_C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(realpath $(VM_CFG_C_SRCS))) VP_BASE_C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(VP_BASE_C_SRCS)) VP_BASE_S_OBJS := $(patsubst %.S,$(HV_OBJDIR)/%.o,$(VP_BASE_S_SRCS)) VP_DM_C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(VP_DM_C_SRCS)) @@ -374,8 +378,8 @@ VERSION := $(HV_OBJDIR)/include/version.h # Create platform_acpi_info.h TEMPLATE_ACPI_INFO_HEADER := arch/x86/configs/platform_acpi_info.h -BOARDTEMPLATE_ACPI_INFO_HEADER := arch/x86/configs/$(BOARD)/platform_acpi_info.h -SOURCE_ACPI_INFO_HEADER := $(BOARD_CFG_DIR)/$(BOARD)_acpi_info.h +BOARDTEMPLATE_ACPI_INFO_HEADER := $(BOARD_INFO_DIR)/platform_acpi_info.h +SOURCE_ACPI_INFO_HEADER := $(BOARD_INFO_DIR)/$(BOARD)_acpi_info.h TARGET_ACPI_INFO_HEADER := $(HV_OBJDIR)/include/platform_acpi_info.h $(TARGET_ACPI_INFO_HEADER): $(HV_OBJDIR)/$(HV_CONFIG) @@ -434,8 +438,8 @@ $(BOOT_MOD): $(BOOT_S_OBJS) $(BOOT_C_OBJS) boot-mod: $(BOOT_MOD) -$(HW_MOD): $(HW_S_OBJS) $(HW_C_OBJS) - $(AR) $(ARFLAGS) $(HW_MOD) $(HW_S_OBJS) $(HW_C_OBJS) +$(HW_MOD): $(HW_S_OBJS) $(HW_C_OBJS) $(VM_CFG_C_OBJS) + $(AR) $(ARFLAGS) $(HW_MOD) $(HW_S_OBJS) $(HW_C_OBJS) $(VM_CFG_C_OBJS) hw-mod: $(HW_MOD) diff --git a/hypervisor/arch/x86/Kconfig b/hypervisor/arch/x86/Kconfig index 7f1d202b1..d4cd96c1b 100644 --- a/hypervisor/arch/x86/Kconfig +++ b/hypervisor/arch/x86/Kconfig @@ -59,7 +59,7 @@ config BOARD config DEFCONFIG_LIST string option defconfig_list - default "arch/x86/configs/$BOARD.config" + default "../misc/vm_configs/scenarios/$SCENARIO/$(BOARD)/$BOARD.config" config RELEASE bool "Release build" diff --git a/hypervisor/boot/include/acpi.h b/hypervisor/boot/include/acpi.h index f5e75f4d8..e3e380f6e 100644 --- a/hypervisor/boot/include/acpi.h +++ b/hypervisor/boot/include/acpi.h @@ -7,8 +7,7 @@ #ifndef ACPI_H #define ACPI_H -#include - +#include #define ACPI_RSDP_CHECKSUM_LENGTH 20U #define ACPI_RSDP_XCHECKSUM_LENGTH 36U diff --git a/hypervisor/include/arch/x86/board.h b/hypervisor/include/arch/x86/board.h index 66f428b37..932c63f23 100644 --- a/hypervisor/include/arch/x86/board.h +++ b/hypervisor/include/arch/x86/board.h @@ -7,7 +7,7 @@ #define BOARD_H #include -#include +#include #include #include diff --git a/hypervisor/include/arch/x86/vm_config.h b/hypervisor/include/arch/x86/vm_config.h index 97b99d950..ecbe12f13 100644 --- a/hypervisor/include/arch/x86/vm_config.h +++ b/hypervisor/include/arch/x86/vm_config.h @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/hypervisor/scripts/makefile/cfg_update.mk b/hypervisor/scripts/makefile/cfg_update.mk index 85cb2efa5..33e7b2dfd 100644 --- a/hypervisor/scripts/makefile/cfg_update.mk +++ b/hypervisor/scripts/makefile/cfg_update.mk @@ -45,17 +45,13 @@ update_config: ifeq ($(CONFIG_XML_ENABLED),true) @if [ ! -f $(UPDATE_RESULT) ]; then \ mkdir -p $(dir $(UPDATE_RESULT));\ - if [ "$(TARGET_DIR)" = "" ]; then \ - python3 ../misc/acrn-config/board_config/board_cfg_gen.py --board $(BOARD_FILE) --scenario $(SCENARIO_FILE) > $(UPDATE_RESULT);\ - else \ - python3 ../misc/acrn-config/board_config/board_cfg_gen.py --board $(BOARD_FILE) --scenario $(SCENARIO_FILE) --out $(TARGET_DIR) > $(UPDATE_RESULT);\ - fi;\ + python3 ../misc/acrn-config/board_config/board_cfg_gen.py --board $(BOARD_FILE) --scenario $(SCENARIO_FILE) --out $(TARGET_DIR) > $(UPDATE_RESULT);\ cat $(UPDATE_RESULT);\ if [ "`sed -n /successfully/p $(UPDATE_RESULT)`" = "" ]; then rm -f $(UPDATE_RESULT); exit 1; fi;\ if [ "$(TARGET_DIR)" = "" ]; then \ python3 ../misc/acrn-config/scenario_config/scenario_cfg_gen.py --board $(BOARD_FILE) --scenario $(SCENARIO_FILE) > $(UPDATE_RESULT);\ else \ - python3 ../misc/acrn-config/scenario_config/scenario_cfg_gen.py --board $(BOARD_FILE) --scenario $(SCENARIO_FILE) --out $(TARGET_DIR) > $(UPDATE_RESULT);\ + python3 ../misc/acrn-config/scenario_config/scenario_cfg_gen.py --board $(BOARD_FILE) --scenario $(SCENARIO_FILE) --out $(realpath $(TARGET_DIR)) > $(UPDATE_RESULT);\ fi;\ cat $(UPDATE_RESULT);\ if [ "`sed -n /successfully/p $(UPDATE_RESULT)`" = "" ]; then rm -f $(UPDATE_RESULT); exit 1; fi;\ diff --git a/hypervisor/scripts/makefile/kconfig.mk b/hypervisor/scripts/makefile/kconfig.mk index eb14d2724..4b43a1443 100644 --- a/hypervisor/scripts/makefile/kconfig.mk +++ b/hypervisor/scripts/makefile/kconfig.mk @@ -36,8 +36,8 @@ ifeq ($(shell [ $(HV_OBJDIR)/$(HV_CONFIG) -nt $(HV_OBJDIR)/$(HV_CONFIG_MK) ] && # only happens when GNU make checks the prerequisites. -include $(HV_OBJDIR)/$(HV_CONFIG) endif -$(eval $(call override_config,BOARD,apl-mrb)) -$(eval $(call override_config,SCENARIO,)) +$(eval $(call override_config,BOARD,nuc7i7dnb)) +$(eval $(call override_config,SCENARIO,industry)) $(eval $(call override_config,RELEASE,y)) override RELEASE := $(CONFIG_RELEASE) @@ -68,18 +68,19 @@ $(HV_OBJDIR)/$(HV_CONFIG_H): $(HV_OBJDIR)/$(HV_CONFIG) .PHONY: defconfig defconfig: $(KCONFIG_DEPS) @mkdir -p $(HV_OBJDIR) - @if ([ "$(KCONFIG_FILE)" == "" ] || ([ "$(KCONFIG_FILE)" != "" ] && [ ! -f $(KCONFIG_FILE) ])) && [ "$(CONFIG_XML_ENABLED)" != "true" ]; then \ - BOARD=$(CONFIG_BOARD) python3 $(KCONFIG_DIR)/defconfig.py Kconfig $(HV_OBJDIR)/$(HV_CONFIG); \ + @BOARD=$(CONFIG_BOARD) SCENARIO=$(CONFIG_SCENARIO); \ + if ([ "$(KCONFIG_FILE)" = "" ] || ([ "$(KCONFIG_FILE)" != "" ] && [ ! -f $(KCONFIG_FILE) ])) && [ "$(CONFIG_XML_ENABLED)" != "true" ]; then \ + python3 $(KCONFIG_DIR)/defconfig.py Kconfig $(HV_OBJDIR)/$(HV_CONFIG); \ else \ if [ "$(KCONFIG_FILE)" != "" ] && [ -f $(KCONFIG_FILE) ]; then \ echo "Writing $(HV_OBJDIR)/$(HV_CONFIG) with $(KCONFIG_FILE)"; \ cp $(KCONFIG_FILE) $(HV_OBJDIR)/$(HV_CONFIG); \ elif [ "$(TARGET_DIR)" != "" ] && [ -d $(TARGET_DIR) ]; then \ - if [ ! -f $(TARGET_DIR)/$(BOARD).config ]; then \ - echo "Board defconfig file $(BOARD).config is not found under $(TARGET_DIR)."; exit 1; \ + if [ ! -f $(TARGET_DIR)/scenarios/$(SCENARIO)/$(BOARD)/$(BOARD).config ]; then \ + echo "Board defconfig file $(BOARD).config is not found under $(TARGET_DIR)/scenarios/$(SCENARIO)/$(BOARD)/."; exit 1; \ fi; \ - echo "Writing $(HV_OBJDIR)/$(HV_CONFIG) with $(TARGET_DIR)/$(BOARD).config"; \ - cp $(TARGET_DIR)/$(BOARD).config $(HV_OBJDIR)/$(HV_CONFIG); \ + echo "Writing $(HV_OBJDIR)/$(HV_CONFIG) with $(BOARD_CFG_DIR)/$(BOARD).config"; \ + cp $(TARGET_DIR)/scenarios/$(SCENARIO)/$(BOARD)/$(BOARD).config $(HV_OBJDIR)/$(HV_CONFIG); \ fi; \ python3 $(KCONFIG_DIR)/silentoldconfig.py Kconfig $(HV_OBJDIR)/$(HV_CONFIG) RELEASE=$(RELEASE); \ fi @@ -91,7 +92,7 @@ defconfig: $(KCONFIG_DEPS) .PHONY: oldconfig oldconfig: $(KCONFIG_DEPS) @mkdir -p $(HV_OBJDIR) - @BOARD=$(CONFIG_BOARD) \ + @BOARD=$(CONFIG_BOARD) SCENARIO=$(CONFIG_SCENARIO) \ python3 $(KCONFIG_DIR)/silentoldconfig.py Kconfig \ $(HV_OBJDIR)/$(HV_CONFIG) \ SCENARIO=$(CONFIG_SCENARIO) RELEASE=$(RELEASE) diff --git a/misc/acrn-config/kconfig/defconfig.py b/misc/acrn-config/kconfig/defconfig.py index f56c14df1..c3c481fb4 100644 --- a/misc/acrn-config/kconfig/defconfig.py +++ b/misc/acrn-config/kconfig/defconfig.py @@ -21,6 +21,7 @@ def main(): sys.exit(1) target_board = os.environ['BOARD'] + target_scenario = os.environ['SCENARIO'] kconfig_path = sys.argv[1] if not os.path.isfile(kconfig_path): @@ -30,7 +31,7 @@ def main(): kconfig = kconfiglib.Kconfig(kconfig_path) defconfig_path = kconfig.defconfig_filename if not defconfig_path or not os.path.isfile(defconfig_path): - sys.stderr.write("No defconfig found for board %s.\n" % target_board) + sys.stderr.write("No defconfig found for BOARD %s on SCENARIO %s.\n" % (target_board, target_scenario)) sys.exit(1) kconfig.load_config(defconfig_path) diff --git a/misc/acrn-config/kconfig/silentoldconfig.py b/misc/acrn-config/kconfig/silentoldconfig.py index eb7a7316b..f7f8024a3 100644 --- a/misc/acrn-config/kconfig/silentoldconfig.py +++ b/misc/acrn-config/kconfig/silentoldconfig.py @@ -97,7 +97,8 @@ def main(): need_update = True else: # report an error if no known defconfig exists - sys.stderr.write(".config does not exist and no defconfig available for BOARD %s.\n" % os.environ['BOARD']) + sys.stderr.write(".config does not exist and no defconfig available for BOARD %s on SCENARIO %s.\n" + % (os.environ['BOARD'], os.environ['SCENARIO'])) sys.exit(1) # Update the old .config with those specified on cmdline diff --git a/misc/vm_configs/scenarios/logical_partition/nuc7i7dnb/misc_cfg.h b/misc/vm_configs/scenarios/logical_partition/nuc7i7dnb/misc_cfg.h index 280006bb7..71c870cec 100644 --- a/misc/vm_configs/scenarios/logical_partition/nuc7i7dnb/misc_cfg.h +++ b/misc/vm_configs/scenarios/logical_partition/nuc7i7dnb/misc_cfg.h @@ -7,4 +7,7 @@ #ifndef MISC_CFG_H #define MISC_CFG_H +#define ROOTFS_0 "root=/dev/sda3 " +#define ROOTFS_1 "root=/dev/nvme0n1p3 " + #endif /* MISC_CFG_H */