From 61f701bc83390fd65e2fbfc3b0d526f9ff3f25f0 Mon Sep 17 00:00:00 2001
From: Naveen Saini <naveen.kumar.saini@intel.com>
Date: Sun, 22 Mar 2020 11:28:18 +0800
Subject: [PATCH] acrn-hypervisor: add support for menuconfig

Run below command to configure via menuconfig
 $ bitbake acrn-hypervisor -c menuconfig

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
 recipes-core/acrn/acrn-common.inc             |  1 +
 recipes-core/acrn/acrn-hypervisor.bb          |  7 +--
 ...allow-BOARD-and-SCENARIO-to-override.patch | 50 +++++++++++++++++++
 3 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 recipes-core/acrn/files/0001-Makefile-allow-BOARD-and-SCENARIO-to-override.patch

diff --git a/recipes-core/acrn/acrn-common.inc b/recipes-core/acrn/acrn-common.inc
index 5abc3ea7..4a1f4ec4 100644
--- a/recipes-core/acrn/acrn-common.inc
+++ b/recipes-core/acrn/acrn-common.inc
@@ -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:
diff --git a/recipes-core/acrn/acrn-hypervisor.bb b/recipes-core/acrn/acrn-hypervisor.bb
index fe725322..86eb22a2 100644
--- a/recipes-core/acrn/acrn-hypervisor.bb
+++ b/recipes-core/acrn/acrn-hypervisor.bb
@@ -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
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -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
diff --git a/recipes-core/acrn/files/0001-Makefile-allow-BOARD-and-SCENARIO-to-override.patch b/recipes-core/acrn/files/0001-Makefile-allow-BOARD-and-SCENARIO-to-override.patch
new file mode 100644
index 00000000..e5fef767
--- /dev/null
+++ b/recipes-core/acrn/files/0001-Makefile-allow-BOARD-and-SCENARIO-to-override.patch
@@ -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
+