Makefile: support make from XML for new board

Currently make hypervisor will depend on a $(BOARD).config file to load
board defconfig which triggered by oldconfig process, this will block
make from XMLs for a new board because $(BOARD).config never exist.
This requires us to patch configuration for new board earlier than make
oldconfig.

Tracked-On: #4067
Signed-off-by: Victor Sun <victor.sun@intel.com>

Makefile

@@ -22,30 +22,20 @@ TOOLS_OUT := $(ROOT_OUT)/misc/tools
 DOC_OUT := $(ROOT_OUT)/doc
 BUILD_VERSION ?=
 BUILD_TAG ?=
-BOARD_FILE ?=
-SCENARIO_FILE ?=
-CONFIG_XML_ENABLED ?= false
 
-export TOOLS_OUT
+export TOOLS_OUT BOARD SCENARIO FIRMWARE RELEASE
 
 .PHONY: all hypervisor devicemodel tools doc
 all: hypervisor devicemodel tools
 
-ifneq ($(BOARD_FILE)$(SCENARIO_FILE),)
-override BOARD := $(shell echo `sed -n '/<acrn-config/p' $(BOARD_FILE) | sed -r 's/.*board="(.*)".*/\1/g'`)
-override SCENARIO := $(shell echo `sed -n '/<acrn-config/p' $(SCENARIO_FILE) | sed -r 's/.*scenario="(.*)".*/\1/g'`)
-
-ifneq ($(BOARD)$(SCENARIO),)
-CONFIG_XML_ENABLED := true
-endif
-endif
-
 ifeq ($(BOARD), apl-nuc)
 override BOARD := nuc6cayh
 else ifeq ($(BOARD), kbl-nuc-i7)
 override BOARD := nuc7i7dnb
 endif
 
+include $(T)/misc/acrn-config/library/cfg_update.mk
+
 #help functions to build acrn and install acrn/acrn symbols
 define build_acrn
 	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-$(1)/$(2) BOARD=$(2) FIRMWARE=$(1) SCENARIO=$(4) RELEASE=$(RELEASE) clean
@@ -74,24 +64,25 @@ define install_acrn_debug
 endef
 
 hypervisor:
-	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE)	\
+	@if [ "$(SCENARIO)" != "sdc" ] && [ "$(SCENARIO)" != "sdc2" ] && [ "$(SCENARIO)" != "industry" ] \
-				BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) clean
+			&& [ "$(SCENARIO)" != "logical_partition" ] && [ "$(SCENARIO)" != "hybrid" ]; then \
-	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE)	\
+		echo "SCENARIO <$(SCENARIO)> is not supported. "; exit 1; \
-				BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) defconfig
+	fi
-	@if [ "$(SCENARIO)" ]; then \
+	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) clean
+	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) defconfig
+	@if [ "$(CONFIG_XML_ENABLED)" = "true" ]; then \
+		echo "CONFIG_$(shell echo $(SCENARIO_IN_XML) | tr a-z A-Z)=y" >> $(HV_OUT)/.config;	\
+		echo "CONFIG_ENFORCE_VALIDATED_ACPI_INFO=y" >> $(HV_OUT)/.config;	\
+	elif [ "$(SCENARIO)" ]; then \
 		echo "CONFIG_$(shell echo $(SCENARIO) | tr a-z A-Z)=y" >> $(HV_OUT)/.config;	\
 	fi
-	@if [ "$(CONFIG_XML_ENABLED)" = "true" ]; then \
+	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)
-		echo "CONFIG_ENFORCE_VALIDATED_ACPI_INFO=y" >> $(HV_OUT)/.config;	\
+#ifeq ($(FIRMWARE),uefi)
+	@if [ "$(SCENARIO)" != "logical_partition" ] && [ "$(SCENARIO)" != "hybrid" ]; then \
+		echo "building hypervisor as EFI executable..."; \
+		$(MAKE) -C $(T)/misc/efi-stub HV_OBJDIR=$(HV_OUT) EFI_OBJDIR=$(HV_OUT)/$(EFI_OUT); \
 	fi
-	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE)	\
+#endif
-				BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) oldconfig
-	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE)	\
-				BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE)
-ifeq ($(FIRMWARE),uefi)
-	echo "building hypervisor as EFI executable..."
-	$(MAKE) -C $(T)/misc/efi-stub HV_OBJDIR=$(HV_OUT) SCENARIO=$(SCENARIO) EFI_OBJDIR=$(HV_OUT)/$(EFI_OUT)
-endif
 
 
 devicemodel: tools

hypervisor/Makefile

@@ -5,8 +5,6 @@
 include ../VERSION
 FULL_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)$(EXTRA_VERSION)
 
-SCENARIO_IN_XML :=
-
 API_MAJOR_VERSION=1
 API_MINOR_VERSION=0
 
@@ -43,14 +41,11 @@ ARCH_ASFLAGS :=
 ARCH_ARFLAGS :=
 ARCH_LDFLAGS :=
 
-ifneq ($(BOARD_FILE)$(SCENARIO_FILE),)
-override BOARD := $(shell echo `sed -n '/<acrn-config/p' $(BOARD_FILE) | sed -r 's/.*board="(.*)".*/\1/g'`)
-SCENARIO_IN_XML := $(shell sed -n '/<acrn-config/p' $(SCENARIO_FILE) | sed -r 's/.*scenario="(.*)".*/\1/g')
-endif
-
 .PHONY: default
 default: all
 
+include $(BASEDIR)/../misc/acrn-config/library/cfg_update.mk
+
 include $(BASEDIR)/../misc/acrn-config/library/deps.mk
 
 include scripts/kconfig/kconfig.mk
@@ -338,7 +333,7 @@ BOARDTEMPLATE_ACPI_INFO_HEADER := arch/x86/configs/$(CONFIG_BOARD)/platform_acpi
 SOURCE_ACPI_INFO_HEADER := arch/x86/configs/$(CONFIG_BOARD)/$(CONFIG_BOARD)_acpi_info.h
 TARGET_ACPI_INFO_HEADER := $(HV_OBJDIR)/include/platform_acpi_info.h
 
-$(TARGET_ACPI_INFO_HEADER): $(HV_OBJDIR)/$(HV_CONFIG) cfg_src
+$(TARGET_ACPI_INFO_HEADER): $(HV_OBJDIR)/$(HV_CONFIG)
 ifeq ($(CONFIG_ENFORCE_VALIDATED_ACPI_INFO),y)
 	@if [ ! -f $(SOURCE_ACPI_INFO_HEADER) ]; then	\
 	 echo "******* No ACPI info found *******" && \
@@ -367,7 +362,7 @@ else
 endif
 
 .PHONY: all
-all: cfg_src pre_build $(HV_OBJDIR)/$(HV_FILE).32.out $(HV_OBJDIR)/$(HV_FILE).bin
+all: pre_build $(HV_OBJDIR)/$(HV_FILE).32.out $(HV_OBJDIR)/$(HV_FILE).bin
 
 install: $(HV_OBJDIR)/$(HV_FILE).32.out
 	install -D $(HV_OBJDIR)/$(HV_FILE).32.out $(DESTDIR)/usr/lib/acrn/$(HV_FILE).$(BOARD).$(FIRMWARE).$(SCENARIO_NAME).32.out
@@ -376,32 +371,6 @@ install-debug: $(HV_OBJDIR)/$(HV_FILE).map $(HV_OBJDIR)/$(HV_FILE).out
 	install -D $(HV_OBJDIR)/$(HV_FILE).out $(DESTDIR)/usr/lib/acrn/$(HV_FILE).$(BOARD).$(FIRMWARE).$(SCENARIO_NAME).out
 	install -D $(HV_OBJDIR)/$(HV_FILE).map $(DESTDIR)/usr/lib/acrn/$(HV_FILE).$(BOARD).$(FIRMWARE).$(SCENARIO_NAME).map
 
-cfg_src: $(VERSION)
-ifneq ($(BOARD_FILE)$(SCENARIO_FILE),)
-	@if [ ! -f $(BOARD_FILE) ]; then \
-		echo "Board xml file $(BOARD_FILE) is not exist!"; exit 1; \
-	fi
-	@if [ ! -f "$(SCENARIO_FILE)" ]; then \
-		echo "Scenario xml file $(SCENARIO_FILE) is not exist!"; exit 1; \
-	fi
-	@if [ "$(BOARD)" != "$(CONFIG_BOARD)" ]; then \
-		echo "Board in xml file <$(BOARD)> does not match Kconfig <$(CONFIG_BOARD)>!"; exit 1; \
-	fi
-	@if [ "$(SCENARIO_IN_XML)" != "$(SCENARIO_NAME)" ]; then \
-		echo "Scenario in xml file <$(SCENARIO_IN_XML)> does not match Kconfig <$(SCENARIO_NAME)>!"; exit 1; \
-	fi
-	@python3 ../misc/acrn-config/board_config/board_cfg_gen.py --board $(BOARD_FILE) --scenario $(SCENARIO_FILE) > $(HV_OBJDIR)/.cfg_src_result
-	@cat $(HV_OBJDIR)/.cfg_src_result
-	@if [ "`sed -n /successfully/p $(HV_OBJDIR)/.cfg_src_result`" = "" ]; then exit 1;	fi
-	@python3 ../misc/acrn-config/scenario_config/scenario_cfg_gen.py --board $(BOARD_FILE) --scenario $(SCENARIO_FILE) > $(HV_OBJDIR)/.cfg_src_result
-	@cat $(HV_OBJDIR)/.cfg_src_result
-	@if [ "`sed -n /successfully/p $(HV_OBJDIR)/.cfg_src_result`" = "" ]; then exit 1;	fi
-	@echo "Import hypervisor configurations from Config-xmls, configurations in source code are ignored!"
-	@sed -i 's/#define HV_CONFIG_TOOL ""/#define HV_CONFIG_TOOL " with acrn-config"/g' $(VERSION)
-else
-	@echo "Use hypervisor configurations from source code directly."
-endif
-
 .PHONY: pre_build
 pre_build: $(PRE_BUILD_OBJS)
 
@@ -467,6 +436,7 @@ $(HV_OBJDIR)/$(HV_FILE).32.out: $(HV_OBJDIR)/$(HV_FILE).out
 
 $(HV_OBJDIR)/$(HV_FILE).bin: $(HV_OBJDIR)/$(HV_FILE).out
 	$(OBJCOPY) -O binary $< $(HV_OBJDIR)/$(HV_FILE).bin
+	rm -f $(UPDATE_RESULT)
 
 $(HV_OBJDIR)/$(HV_FILE).out: $(MODULES)
 	${BASH} ${LD_IN_TOOL} $(ARCH_LDSCRIPT_IN) $(ARCH_LDSCRIPT) ${HV_OBJDIR}/.config
@@ -487,6 +457,10 @@ distclean:
 
 PHONY: (VERSION)
 $(VERSION):
+	@echo "SCENARIO <$(SCENARIO_NAME)> for BOARD <$(BOARD)> is specified."
+	@if [ "$(CONFIG_XML_ENABLED)" = "true" ] && [ "$(SCENARIO_NAME)" != "$(SCENARIO_IN_XML)" ]; then \
+		echo "SCENARIO in XML <$(SCENARIO_IN_XML)> does not match SCENARIO in Kconfig <$(SCENARIO_NAME)> !" ; exit 1; \
+	fi
 	touch $(VERSION)
 	@COMMIT=`git rev-parse --verify --short HEAD 2>/dev/null`;\
 	DIRTY=`git diff-index --name-only HEAD`;\
@@ -509,7 +483,11 @@ $(VERSION):
 	echo "#define HV_BUILD_TYPE "\""$$BUILD_TYPE"\""" >> $(VERSION);\
 	echo "#define HV_BUILD_TIME "\""$$TIME"\""" >> $(VERSION);\
 	echo "#define HV_BUILD_USER "\""$$USER"\""" >> $(VERSION);\
-	echo "#define HV_CONFIG_TOOL \"\"" >> $(VERSION);\
+	if [ "$(CONFIG_XML_ENABLED)" = "true" ]; then \
+		echo "#define HV_CONFIG_TOOL \" with acrn-config\"" >> $(VERSION);\
+	else	\
+		echo "#define HV_CONFIG_TOOL \"\"" >> $(VERSION);\
+	fi;\
 	echo "#endif" >> $(VERSION)
 
 -include $(C_OBJS:.o=.d)

hypervisor/scripts/kconfig/kconfig.mk

@@ -54,7 +54,7 @@ $(eval $(call check_dep_py3lib,kconfiglib,KCONFIG_DEPS))
 #
 # A dummy command is necessary to trigger the remaking of config.mk right after
 # oldconfig changes HV_CONFIG in the same execution of make.
-$(HV_OBJDIR)/$(HV_CONFIG): oldconfig
+$(HV_OBJDIR)/$(HV_CONFIG): update_config oldconfig
 	@true
 
 # Note: This target must not depend on a phony target (e.g. oldconfig) because

misc/acrn-config/library/cfg_update.mk

@@ -0,0 +1,48 @@
+CONFIG_XML_ENABLED ?=
+UPDATE_RESULT = $(HV_OBJDIR)/.cfg_src_result
+
+define check_xml_enabled =
+CONFIG_XML_ENABLED := $(shell if [ "$(1)" != "" ] || [ "$(2)" != "" ]; then echo false; fi)
+BOARD_IN_XML := $(shell echo `if [ "$(1)" != "" ]; then sed -n '/<acrn-config/p' $(1) | sed -r 's/.*board="(.*)".*/\1/g'; fi`)
+SCENARIO_IN_XML := $(shell echo `if [ "$(2)" != "" ]; then sed -n '/<acrn-config/p' $(2) | sed -r 's/.*scenario="(.*)".*/\1/g'; fi`)
+
+ifneq ($$(BOARD_IN_XML),)
+    ifneq ($$(SCENARIO_IN_XML),)
+        CONFIG_XML_ENABLED := true
+    endif
+endif
+
+ifeq ($$(CONFIG_XML_ENABLED),true)
+    override BOARD := $$(BOARD_IN_XML)
+    override SCENARIO := $$(SCENARIO_IN_XML)
+endif
+
+
+endef
+
+ifeq ($(CONFIG_XML_ENALBED),)
+    $(eval $(call check_xml_enabled,$(BOARD_FILE),$(SCENARIO_FILE)))
+endif
+
+update_config:
+ifeq ($(CONFIG_XML_ENABLED),true)
+	@if [ ! -f $(UPDATE_RESULT) ]; then \
+		mkdir -p $(dir $(UPDATE_RESULT));\
+		python3 ../misc/acrn-config/board_config/board_cfg_gen.py --board $(BOARD_FILE) --scenario $(SCENARIO_FILE) > $(UPDATE_RESULT);\
+		cat $(UPDATE_RESULT);\
+		if [ "`sed -n /successfully/p $(UPDATE_RESULT)`" = "" ]; then rm -f $(UPDATE_RESULT); exit 1;	fi;\
+		python3 ../misc/acrn-config/scenario_config/scenario_cfg_gen.py --board $(BOARD_FILE) --scenario $(SCENARIO_FILE) > $(UPDATE_RESULT);\
+		cat $(UPDATE_RESULT);\
+		if [ "`sed -n /successfully/p $(UPDATE_RESULT)`" = "" ]; then rm -f $(UPDATE_RESULT); exit 1;	fi;\
+		echo "Import hypervisor Board/VM configuration from XMLs, configurations in source code has been overwritten!";\
+	elif [ "`sed -n /successfully/p $(UPDATE_RESULT)`" = "" ]; then \
+		echo "Problem is found on Board/VM configration patching, please rebuild."; rm -f $(UPDATE_RESULT); exit 1; \
+	else \
+		echo "Configurations is patched already!";\
+	fi;
+else ifeq ($(CONFIG_XML_ENABLED),false)
+	@echo "Config XML file does not exist or with unknown format."
+	@exit 1
+else
+	@echo "Using hypervisor configurations from source code directly."
+endif