From 24c5cfbe805bdfc8cb71762f614d19eadd9a316c Mon Sep 17 00:00:00 2001
From: Jon Mason <jon.mason@arm.com>
Date: Sat, 24 Apr 2021 15:08:54 -0400
Subject: [PATCH] arm: combine linux-yocto bbappend files

Combining linux-yocto bbappend into a single file.

Change-Id: Ica4fc2d0edc9939451c572e5eb65f34e4002c26f
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend  | 11 -----------
 .../recipes-kernel/linux/linux-yocto_5.10.bbappend    |  9 +++++++++
 2 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 100644 meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend

diff --git a/meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend
deleted file mode 100644
index bc600037..00000000
--- a/meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend
+++ /dev/null
@@ -1,11 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}:${THISDIR}/linux-yocto:"
-
-SRC_URI_append_qemuarm64-sbsa = " \
-    file://defconfig.patch \
-    "
-
-COMPATIBLE_MACHINE_generic-arm64 = "generic-arm64"
-
-SRC_URI_append_generic-arm64 = " \
-    file://defconfig.patch \
-    "
diff --git a/meta-arm/recipes-kernel/linux/linux-yocto_5.10.bbappend b/meta-arm/recipes-kernel/linux/linux-yocto_5.10.bbappend
index a538dbbc..be2545f0 100644
--- a/meta-arm/recipes-kernel/linux/linux-yocto_5.10.bbappend
+++ b/meta-arm/recipes-kernel/linux/linux-yocto_5.10.bbappend
@@ -1,3 +1,12 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
+COMPATIBLE_MACHINE_generic-arm64 = "generic-arm64"
+SRC_URI_append_generic-arm64 = " \
+    file://defconfig.patch \
+    "
+
+SRC_URI_append_qemuarm64-sbsa = " \
+    file://defconfig.patch \
+    "
+
 SRC_URI_append_qemuarm64-secureboot = " file://zone_dma_revert.patch"