[meta-rockchip][PATCH 4/4] nanopc-t6: use non -dev kernel

[Trevor Woerner <twoerner@gmail.com>]

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

NOTE: keep the various pieces of linux-yocto-dev infrastructure in place
      so it can be used more easily again should it be needed

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

diff --git a/conf/machine/nanopc-t6.conf b/conf/machine/nanopc-t6.conf
index 5ed413d1c0e5..8d524bd764f6 100644
--- a/conf/machine/nanopc-t6.conf
+++ b/conf/machine/nanopc-t6.conf
@@ -5,7 +5,6 @@
 
 require conf/machine/include/rk3588.inc
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
 KERNEL_DEVICETREE = " \
     rockchip/rk3588-nanopc-t6.dtb \
     rockchip/rk3588-nanopc-t6-lts.dtb \
diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend
index 6f4981fe29e6..e06c8a4f717d 100644
--- a/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,5 +1,3 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-COMPATIBLE_MACHINE:nanopc-t6 = "nanopc-t6"
-
-SRC_URI:append:nanopc-t6 = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
+SRC_URI:append = " 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 45cfb1c10b48..470aeb8f16b1 100644
--- a/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -8,6 +8,7 @@ COMPATIBLE_MACHINE:tinker-board = "tinker-board"
 COMPATIBLE_MACHINE:tinker-board-s = "tinker-board-s"
 COMPATIBLE_MACHINE:vyasa-rk3288 = "vyasa-rk3288"
 
+COMPATIBLE_MACHINE:nanopc-t6 = "nanopc-t6"
 COMPATIBLE_MACHINE:nanopi-m4 = "nanopi-m4"
 COMPATIBLE_MACHINE:nanopi-m4-2gb = "nanopi-m4-2gb"
 COMPATIBLE_MACHINE:nanopi-m4b = "nanopi-m4b"
-- 
2.44.0.501.g19981daefd7c