From 3f3a51ba8261394713b71bcfb19ad730cf57aa2c Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Mon, 4 Nov 2019 11:39:09 +0800 Subject: [PATCH] Revert "Makefile: add default defconfig for new board" This reverts commit 9ddf27669bc2a7dab643b138fe55572fcb2cba6c. Souce code should be generate out firstly to solve the dependency for make all acrn-hypervisor code. 9ddf27669bc commit does not work in some scenario, so revert it. Tracked-On: #3779 Signed-off-by: Wei Liu Acked-by: Victor Sun --- Makefile | 1 - hypervisor/Makefile | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index f0bf74ba2..7633d6a1e 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,6 @@ define install_acrn_debug endef hypervisor: - $(MAKE) -C $(T)/hypervisor cfg_src $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) \ BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) clean $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) \ diff --git a/hypervisor/Makefile b/hypervisor/Makefile index 8276fece2..3940930d6 100644 --- a/hypervisor/Makefile +++ b/hypervisor/Makefile @@ -43,8 +43,6 @@ ARCH_ASFLAGS := ARCH_ARFLAGS := ARCH_LDFLAGS := -DEFCONFIG_FILE := $(CURDIR)/arch/x86/configs/$(BOARD).config - ifneq ($(BOARD_FILE)$(SCENARIO_FILE),) override BOARD := $(shell echo `sed -n '/ does not match Kconfig <$(CONFIG_BOARD)>!"; exit 1; \ fi - @if [ "$(SCENARIO_IN_XML)" != "$(SCENARIO_NAME)" ] && [ -f $(DEFCONFIG_FILE) ]; then \ + @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