Skip to content

Commit 9ddf276

Browse files
Wei Liuwenlingz
authored andcommitted
Makefile: add default defconfig for new board
The makefile is depended on board defconfig file to build hypervisor, so we need to add a default defconfig file for a new board. Tracked-On: #3779 Signed-off-by: Wei Liu <weix.w.liu@intel.com> Acked-by: Victor Sun <victor.sun@intel.com>
1 parent 382af0b commit 9ddf276

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Makefile

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

hypervisor/Makefile

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

46+
DEFCONFIG_FILE := $(CURDIR)/arch/x86/configs/$(BOARD).config
47+
4648
ifneq ($(BOARD_FILE)$(SCENARIO_FILE),)
4749
override BOARD := $(shell echo `sed -n '/<acrn-config/p' $(BOARD_FILE) | sed -r 's/.*board="(.*)".*/\1/g'`)
4850
SCENARIO_IN_XML := $(shell sed -n '/<acrn-config/p' $(SCENARIO_FILE) | sed -r 's/.*scenario="(.*)".*/\1/g')
@@ -388,7 +390,7 @@ ifneq ($(BOARD_FILE)$(SCENARIO_FILE),)
388390
@if [ "$(BOARD)" != "$(CONFIG_BOARD)" ]; then \
389391
echo "Board in xml file <$(BOARD)> does not match Kconfig <$(CONFIG_BOARD)>!"; exit 1; \
390392
fi
391-
@if [ "$(SCENARIO_IN_XML)" != "$(SCENARIO_NAME)" ]; then \
393+
@if [ "$(SCENARIO_IN_XML)" != "$(SCENARIO_NAME)" ] && [ -f $(DEFCONFIG_FILE) ]; then \
392394
echo "Scenario in xml file <$(SCENARIO_IN_XML)> does not match Kconfig <$(SCENARIO_NAME)>!"; exit 1; \
393395
fi
394396
@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)