From 99cc9fd97d440cb4fcc4d01a20f203de8ffd59c9 Mon Sep 17 00:00:00 2001 From: Nikita Ioffe Date: Tue, 16 May 2023 17:07:35 +0000 Subject: [PATCH] Add a flag to build husky with nvhe hypervisor Android Virtualization Framework (AVF) team is planning to use husky as a development platform while working on the infrastructure to support assigning devices to guest VMs. In order to test the kernel/user space code we will need to run hypervisor in nvhe mode. Bug: 278008256 Test: flash build and check that hypervisor is in nvhe mode Change-Id: Ide100f571813e9b8a1eba7b57f050d2f7093cd86 --- husky/BoardConfig.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index e2fbeac..f265d7a 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -29,3 +29,12 @@ include device/google/zuma/BoardConfig-common.mk -include vendor/google_devices/husky/proprietary/BoardConfigVendor.mk include device/google/shusky-sepolicy/husky-sepolicy.mk include device/google/shusky/wifi/BoardConfig-wifi.mk + +# Android Virtualization Framework (AVF) team is using husky with hypervisor in +# nvhe mode as a development platform to build infrastructure that supports +# assigning devices to guest VMs. +# +# TODO(b/278008514): remove this once we have builds from our kernel branch. +ifeq ($(HUSKY_ENABLE_DEVICE_ASSIGNMENT), true) +BOARD_KERNEL_CMDLINE += kvm-arm.mode=nvhe +endif