Skip to content

Commit 3f3a51b

Browse files
Wei Liuwenlingz
authored andcommitted
Revert "Makefile: add default defconfig for new board"
This reverts commit 9ddf276. Souce code should be generate out firstly to solve the dependency for make all acrn-hypervisor code. 9ddf276 commit does not work in some scenario, so revert it. Tracked-On: #3779 Signed-off-by: Wei Liu <weix.w.liu@intel.com> Acked-by: Victor Sun <victor.sun@intel.com>
1 parent 99e2d6b commit 3f3a51b

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ define install_acrn_debug
7474
endef
7575
7676
hypervisor:
77-
$(MAKE) -C $(T)/hypervisor cfg_src
7877
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) \
7978
BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) clean
8079
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) \

hypervisor/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ ARCH_ASFLAGS :=
4343
ARCH_ARFLAGS :=
4444
ARCH_LDFLAGS :=
4545

46-
DEFCONFIG_FILE := $(CURDIR)/arch/x86/configs/$(BOARD).config
47-
4846
ifneq ($(BOARD_FILE)$(SCENARIO_FILE),)
4947
override BOARD := $(shell echo `sed -n '/<acrn-config/p' $(BOARD_FILE) | sed -r 's/.*board="(.*)".*/\1/g'`)
5048
SCENARIO_IN_XML := $(shell sed -n '/<acrn-config/p' $(SCENARIO_FILE) | sed -r 's/.*scenario="(.*)".*/\1/g')
@@ -390,7 +388,7 @@ ifneq ($(BOARD_FILE)$(SCENARIO_FILE),)
390388
@if [ "$(BOARD)" != "$(CONFIG_BOARD)" ]; then \
391389
echo "Board in xml file <$(BOARD)> does not match Kconfig <$(CONFIG_BOARD)>!"; exit 1; \
392390
fi
393-
@if [ "$(SCENARIO_IN_XML)" != "$(SCENARIO_NAME)" ] && [ -f $(DEFCONFIG_FILE) ]; then \
391+
@if [ "$(SCENARIO_IN_XML)" != "$(SCENARIO_NAME)" ]; then \
394392
echo "Scenario in xml file <$(SCENARIO_IN_XML)> does not match Kconfig <$(SCENARIO_NAME)>!"; exit 1; \
395393
fi
396394
@python3 ../misc/acrn-config/board_config/board_cfg_gen.py --board $(BOARD_FILE) --scenario $(SCENARIO_FILE) > $(HV_OBJDIR)/.cfg_src_result

0 commit comments

Comments
 (0)