[meta-rockchip][PATCH 3/4] orangepi-5-plus: use non -dev kernel

[Trevor Woerner <twoerner@gmail.com>]

Now that 6.16.y is the preferred version of the linux-yocto kernel, the
orangepi-5-plus machine that had been using the linux-yocto-dev kernel can
be switched to using the linux-yocto kernel instead.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 conf/machine/orangepi-5-plus.conf             | 1 -
 recipes-kernel/linux/linux-yocto-dev.bbappend | 2 --
 recipes-kernel/linux/linux-yocto_%.bbappend   | 1 +
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/conf/machine/orangepi-5-plus.conf b/conf/machine/orangepi-5-plus.conf
index 2731ff4d871d..a726b1c0ca67 100644
--- a/conf/machine/orangepi-5-plus.conf
+++ b/conf/machine/orangepi-5-plus.conf
@@ -5,7 +5,6 @@
 
 require conf/machine/include/rk3588.inc
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
 KERNEL_DEVICETREE = "rockchip/rk3588-orangepi-5-plus.dtb"
 MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
 
diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend
index b876a1cefedb..6f4981fe29e6 100644
--- a/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,7 +1,5 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-COMPATIBLE_MACHINE:orangepi-5-plus = "orangepi-5-plus"
 COMPATIBLE_MACHINE:nanopc-t6 = "nanopc-t6"
 
-SRC_URI:append:orangepi-5-plus = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
 SRC_URI:append:nanopc-t6 = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend
index 9d60e2641ec5..45cfb1c10b48 100644
--- a/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -13,6 +13,7 @@ COMPATIBLE_MACHINE:nanopi-m4-2gb = "nanopi-m4-2gb"
 COMPATIBLE_MACHINE:nanopi-m4b = "nanopi-m4b"
 COMPATIBLE_MACHINE:nanopi-r2s = "nanopi-r2s"
 COMPATIBLE_MACHINE:nanopi-r4s = "nanopi-r4s"
+COMPATIBLE_MACHINE:orangepi-5-plus = "orangepi-5-plus"
 COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3"
 COMPATIBLE_MACHINE:roc-rk3308-cc = "roc-rk3308-cc"
 COMPATIBLE_MACHINE:roc-rk3328-cc = "roc-rk3328-cc"
-- 
2.44.0.501.g19981daefd7c