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

@@ -22,7 +22,5 @@ SRC_URI += "file://rauc.cfg"
 # 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"
-
 SRC_URI += "file://efi-arm.cfg"
 

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

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

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

@@ -2,6 +2,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+KBRANCH:qemuarm  ?= "v5.15/standard/arm-versatile-926ejs"
+SRCREV_machine:qemuarm ?= "c284142affccb534122ad93bdcd4774af161d767"
+
 KBRANCH:qemuarm64-efi ?= "v5.15/standard/qemuarm64"
 SRCREV_machine:qemuarm64-efi ?= "c4c194a34c568c17389120608b2ee8a7a988150a"