From 2e5e637ed534b7c7e6a52f29c4ebdef134dcae0a Mon Sep 17 00:00:00 2001
From: Luca Seritan <luca.seritan@huawei.com>
Date: Mon, 22 Aug 2022 17:58:29 +0200
Subject: [PATCH] Add efi.cfg to machines that have the efi feature

Machines that have the efi feature also need the efi kernel features, so
add these by default to both linux-oniro and linux-yocto.

Signed-off-by: Luca Seritan <luca.seritan@huawei.com>
---
 meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb    | 1 +
 meta-oniro-core/recipes-kernel/linux/linux-yocto_%.bbappend | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb b/meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb
index 951e2ec7..3027af17 100644
--- a/meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb
+++ b/meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb
@@ -40,3 +40,4 @@ KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
 KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}"
 KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}"
 KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}"
+KERNEL_FEATURES:append = " ${@bb.utils.contains("MACHINE_FEATURES", "efi", " cfg/efi.scc", "", d)}"
diff --git a/meta-oniro-core/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-oniro-core/recipes-kernel/linux/linux-yocto_%.bbappend
index 2fc54b20..47765c31 100644
--- a/meta-oniro-core/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/meta-oniro-core/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -5,3 +5,5 @@
 require recipes-kernel/linux/linux-oniro-tweaks-all.inc
 
 SRC_URI += "file://fix-efi.cfg-drop-acpi-dependency.patch;patchdir=${KMETA}"
+ 
+KERNEL_FEATURES:append = " ${@bb.utils.contains("MACHINE_FEATURES", "efi", " cfg/efi.scc", "", d)}"
-- 
GitLab