Clean up qemuarm-efi kernel config

Current qemuarm-efi defconfig contains many useless features,
remove it and use the qemuarm base config with additional EFI features.

For linux-yocto compatibility, set qemuarm-efi to fetch from the same
machine specific branches as qemuarm.

Signed-off-by: Luca Seritan <luca.seritan@huawei.com>

meta-oniro-core/conf/machine/qemuarm-efi.conf

@@ -12,6 +12,9 @@ require conf/machine/include/qemu-efi.inc
 
 KERNEL_IMAGETYPE ?= "zImage"
 
+# Use the qemuarma15 kernel config as the base config of this machine
+KMACHINE = "qemuarma15"
+
 # For runqemu
 QB_SYSTEM_NAME = "qemu-system-arm"
 QB_MACHINE_VIRT_HIGHMEM = "off"

meta-oniro-core/recipes-kernel/linux/linux-oniro-tweaks-all.inc

@@ -21,5 +21,3 @@ SRC_URI += "file://rauc.cfg"
 # For the gcc-plugins build of the kernel we need to ensure the right include
 # path for headers is picked up to use the natively build dependencies.
 export HOSTCXXFLAGS = " -I${RECIPE_SYSROOT_NATIVE}/usr/include"
-
-SRC_URI:append:qemuarm-efi = " file://defconfig"

meta-oniro-core/recipes-kernel/linux/linux-yocto_5.10.bbappend

@@ -2,5 +2,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+KBRANCH:qemuarm-efi ?= "v5.10/standard/arm-versatile-926ejs"
+SRCREV_machine:qemuarm-efi ?= "23ab0f8300e7b90fdf1e0be923933d5cfd03b618"
+
 KBRANCH:qemuarm64-efi ?= "v5.10/standard/qemuarm64"
 SRCREV_machine:qemuarm64-efi ?= "5ff1949cbb7ff90ae3e4dc6fd0fd9876ffaab9d2"