diff mbox series

[meta-rockchip,2/4] radxa-zero-3: use non -dev kernel

Message ID 20250831114105.27494-2-twoerner@gmail.com
State New
Headers show
Series [meta-rockchip,1/4] linux-yocto bbappend: sort | expand

Commit Message

Trevor Woerner Aug. 31, 2025, 11:41 a.m. UTC
Now that 6.16.y is the preferred version of the linux-yocto kernel, the
radxa-zero-3 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/include/radxa-zero-3.inc         | 1 -
 recipes-kernel/linux/linux-yocto-dev.bbappend | 2 --
 recipes-kernel/linux/linux-yocto_%.bbappend   | 1 +
 3 files changed, 1 insertion(+), 3 deletions(-)

Comments

Quentin Schulz Sept. 1, 2025, 11:56 a.m. UTC | #1
Hi Trevor,

On 8/31/25 1:41 PM, Trevor Woerner via lists.yoctoproject.org wrote:
> Now that 6.16.y is the preferred version of the linux-yocto kernel, the
> radxa-zero-3 machine that had been using the linux-yocto-dev kernel can be
> switched to using the linux-yocto kernel instead.
> 

Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>

Thanks!
Quentin
Trevor Woerner Sept. 2, 2025, 12:52 p.m. UTC | #2
On Sun 2025-08-31 @ 07:41:03 AM, Trevor Woerner wrote:
> Now that 6.16.y is the preferred version of the linux-yocto kernel, the
> radxa-zero-3 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/include/radxa-zero-3.inc         | 1 -
>  recipes-kernel/linux/linux-yocto-dev.bbappend | 2 --
>  recipes-kernel/linux/linux-yocto_%.bbappend   | 1 +
>  3 files changed, 1 insertion(+), 3 deletions(-)

Added to meta-rockchip, master branch.
diff mbox series

Patch

diff --git a/conf/machine/include/radxa-zero-3.inc b/conf/machine/include/radxa-zero-3.inc
index b351afae8c0f..b05a0872a511 100644
--- a/conf/machine/include/radxa-zero-3.inc
+++ b/conf/machine/include/radxa-zero-3.inc
@@ -2,7 +2,6 @@  MACHINEOVERRIDES =. "radxa-zero-3:"
 
 require conf/machine/include/rk3566.inc
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
 MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
 
 UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig"
diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend
index f49768ba57f1..b876a1cefedb 100644
--- a/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,9 +1,7 @@ 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 COMPATIBLE_MACHINE:orangepi-5-plus = "orangepi-5-plus"
-COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3"
 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:radxa-zero-3 = " 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 cd5efcf9d25c..9d60e2641ec5 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:radxa-zero-3 = "radxa-zero-3"
 COMPATIBLE_MACHINE:roc-rk3308-cc = "roc-rk3308-cc"
 COMPATIBLE_MACHINE:roc-rk3328-cc = "roc-rk3328-cc"
 COMPATIBLE_MACHINE:rock-3a = "rock-3a"