[OE-core] [OE-Core][PATCH 3/3] qemuarm: Rename qemuarma15 to qemuarm

[Jon Mason]

Rename qemuarma15 to qemuarm.  This makes the default QEMU Arm setup to
emulate the more modern ARMv7 Cortex-A.

Signed-off-by: Jon Mason <jdmason at kudzu.us>
---
 meta/conf/machine/{qemuarma15.conf => qemuarm.conf} | 0
 meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb    | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb  | 2 +-
 meta/recipes-kernel/linux/linux-yocto_4.19.bb       | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/conf/machine/{qemuarma15.conf => qemuarm.conf} (100%)

diff --git a/meta/conf/machine/qemuarma15.conf b/meta/conf/machine/qemuarm.conf
similarity index 100%
rename from meta/conf/machine/qemuarma15.conf
rename to meta/conf/machine/qemuarm.conf
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
index d518677f42..a0476540e1 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
@@ -31,7 +31,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
 
 LINUX_KERNEL_TYPE = "preempt-rt"
 
-COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarmv5|qemuarma15|qemuarm64|qemuppc|qemumips)"
+COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarmv5|qemuarm|qemuarm64|qemuppc|qemumips)"
 
 KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
index a51270f731..caf46a1c09 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
@@ -24,7 +24,7 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}"
 
-COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarmv5|qemuarma15"
+COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarmv5|qemuarm"
 
 # Functionality flags
 KERNEL_FEATURES = ""
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb
index 69ae644417..505164bced 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb
@@ -37,7 +37,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
 
 KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
 
-COMPATIBLE_MACHINE = "qemuarmv5|qemuarma15|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
+COMPATIBLE_MACHINE = "qemuarmv5|qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
 
 # Functionality flags
 KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
-- 
2.17.2