Skip to content

acrn-hypervisor: add support for menuconfig #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
saininav wants to merge 1 commit into
base: master
Choose a base branch
from
Open

acrn-hypervisor: add support for menuconfig #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions recipes-core/acrn/acrn-common.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ SRC_URI = "git://github.com/projectacrn/acrn-hypervisor.git;branch=release_1.5 \
file://0001-hypervisor-Makefile-do-not-strip.patch \
file://0001-acrn-config-append-kconfig-setting-on-new-board.patch \
file://Fix-build-issue-if-the-ld-is-updated-to-2.34.patch \
file://0001-Makefile-allow-BOARD-and-SCENARIO-to-override.patch \
"

# Snapshot tags are of the format:
Expand Down
7 changes: 4 additions & 3 deletions recipes-core/acrn/acrn-hypervisor.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ ACRN_BOARD ?= "nuc7i7dnb"
ACRN_FIRMWARE ?= "uefi"
ACRN_SCENARIO ?= "sdc"

EXTRA_OEMAKE += "HV_OBJDIR=${B}/hypervisor EFI_OBJDIR=${B}/efi-stub"
EXTRA_OEMAKE += "T=${S} HV_OBJDIR=${B}/hypervisor EFI_OBJDIR=${B}/efi-stub"
EXTRA_OEMAKE += "BOARD=${ACRN_BOARD} FIRMWARE=${ACRN_FIRMWARE} SCENARIO=${ACRN_SCENARIO}"
EXTRA_OEMAKE += "BOARD_FILE=${S}/misc/acrn-config/xmls/board-xmls/${ACRN_BOARD}.xml SCENARIO_FILE=${S}/misc/acrn-config/xmls/config-xmls/${ACRN_BOARD}/${ACRN_SCENARIO}.xml"

inherit python3native deploy
inherit python3native deploy cml1
Copy link

@moto-timo moto-timo Jun 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice touch to inherit cml1. I had previously just copied and pasted it into the recipe :)


PACKAGE_ARCH = "${MACHINE_ARCH}"

Expand All @@ -23,9 +23,10 @@ EOF
cat ${S}/hypervisor/arch/x86/configs/${ACRN_BOARD}.config
}

do_menuconfig[dirs] = "${S}/hypervisor"

do_compile() {
oe_runmake -C hypervisor
oe_runmake hypervisor
if [ "${ACRN_FIRMWARE}" = "uefi" ]; then
oe_runmake -C misc/efi-stub
fi
Expand Down
50 changes: 50 additions & 0 deletions recipes-core/acrn/files/0001-Makefile-allow-BOARD-and-SCENARIO-to-override.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
From 2295475630f09621d910cafe3d60cef149cb720c Mon Sep 17 00:00:00 2001
From: Naveen Saini <naveen.kumar.saini@intel.com>
Date: Sat, 21 Mar 2020 21:27:03 +0800
Subject: [PATCH] Makefile: allow BOARD and SCENARIO to override

If BOARD and SCENARIO is updated by menuconfig, then
mismatch occurs. So allow the override for xml paths

Upstream-Status: Pending

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
Makefile | 2 ++
hypervisor/Makefile | 3 +++
2 files changed, 5 insertions(+)

diff --git a/Makefile b/Makefile
index 0eab2e64..98f15156 100644
--- a/Makefile
+++ b/Makefile
@@ -71,10 +71,12 @@ ifeq ($(DEFAULT_MENU_CONFIG_FILE), $(wildcard $(DEFAULT_MENU_CONFIG_FILE)))

ifneq ($(BOARD_IN_MENUCONFIG),$(BOARD))
override BOARD := $(BOARD_IN_MENUCONFIG)
+ override BOARD_FILE := ${T}/misc/acrn-config/xmls/board-xmls/${BOARD}.xml
endif

ifneq ($(SCENARIO_IN_MENUCONFIG),$(SCENARIO))
override SCENARIO := $(SCENARIO_IN_MENUCONFIG)
+ override SCENARIO_FILE := ${T}/misc/acrn-config/xmls/config-xmls/${BOARD}/${SCENARIO}.xml
endif

endif
diff --git a/hypervisor/Makefile b/hypervisor/Makefile
index aa282d19..2442c7cd 100644
--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
@@ -20,6 +20,9 @@ HV_MODDIR ?= $(HV_OBJDIR)/modules
HV_FILE := acrn
SUB_MAKEFILES := $(wildcard */Makefile)

+BOARD ?= kbl-nuc-i7
+SCENARIO ?= sdc
+
LIB_MOD = $(HV_MODDIR)/lib_mod.a
BOOT_MOD = $(HV_MODDIR)/boot_mod.a
HW_MOD = $(HV_MODDIR)/hw_mod.a
--
2.17.1