From fbdb55a9a63289a3bfd24237a46fd3cd038be220 Mon Sep 17 00:00:00 2001 From: Viswanath Kraleti Date: Sat, 23 May 2026 16:21:25 +0530 Subject: [PATCH] qcom-common.inc: use COMBINED_FEATURES to select KVM XBL config Select xbl_config_kvm.elf when 'kvm' is in COMBINED_FEATURES. Switching to COMBINED_FEATURES allows per-platform control as well as distribution specific control of KVM enablement. Signed-off-by: Viswanath Kraleti --- conf/machine/include/qcom-common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/qcom-common.inc b/conf/machine/include/qcom-common.inc index 207a3e92..fdab6de4 100644 --- a/conf/machine/include/qcom-common.inc +++ b/conf/machine/include/qcom-common.inc @@ -37,7 +37,7 @@ IMAGE_FSTYPES ?= "ext4.gz" IMAGE_ROOTFS_ALIGNMENT ?= "4096" # XBL Config selection -QCOM_XBL_CONFIG ?= "${@bb.utils.contains("MACHINE_FEATURES", "kvm", "xbl_config_kvm.elf", "xbl_config.elf", d)}" +QCOM_XBL_CONFIG ?= "${@bb.utils.contains("COMBINED_FEATURES", "kvm", "xbl_config_kvm.elf", "xbl_config.elf", d)}" # Android boot image settings QCOM_BOOTIMG_KERNEL_BASE ?= "0x80000000"