From 3c1d2b073b6b1553bc7b0e4cffa2b88a1d428954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20K=C3=A4stner?= <git@oliver-kaestner.de>
Date: Mon, 24 Mar 2025 18:20:21 +0100
Subject: [PATCH] fix handling KERNEL_DEVICETREE with allwinner/ prefix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since linux 6.5, .dts files live in vendor subdirs. Fix all
`KERNEL_DEVICETREE` definitions to contain the `allwinner` subdir as
prefix and drop code that previously added the prefix on demand.
On the other hand, drop the prefix for `BOOT_IMAGE_FILES`, which
searches the .dtb within `DEPLOY_DIR`.

Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>
---
 conf/machine/bananapi-m2-berry.conf       |  2 +-
 conf/machine/bananapi-m2-zero.conf        |  3 +--
 conf/machine/bananapi-m2m.conf            |  3 +--
 conf/machine/bananapi-m2plus.conf         |  3 +--
 conf/machine/bananapi.conf                |  4 ++--
 conf/machine/cubieboard.conf              |  2 +-
 conf/machine/cubieboard2.conf             |  2 +-
 conf/machine/cubieboard4.conf             |  2 +-
 conf/machine/cubietruck.conf              |  4 ++--
 conf/machine/include/sunxi.inc            |  2 +-
 conf/machine/include/sunxi64.inc          | 22 +---------------------
 conf/machine/lamobo-r1.conf               |  2 +-
 conf/machine/licheepi-zero.conf           |  2 +-
 conf/machine/mangopi-mq-t-t113.conf       |  2 +-
 conf/machine/marsboard-a10.conf           |  2 +-
 conf/machine/mele.conf                    |  4 ++--
 conf/machine/merrii-a80-optimus.conf      |  2 +-
 conf/machine/nanopi-m1-plus.conf          |  3 +--
 conf/machine/nanopi-m1.conf               |  2 +-
 conf/machine/nanopi-neo-air.conf          |  2 +-
 conf/machine/nanopi-neo.conf              |  3 +--
 conf/machine/nanopi-r1.conf               |  2 +-
 conf/machine/olinuxino-a10lime.conf       |  4 ++--
 conf/machine/olinuxino-a10s.conf          |  4 ++--
 conf/machine/olinuxino-a13.conf           |  4 ++--
 conf/machine/olinuxino-a20.conf           |  4 ++--
 conf/machine/olinuxino-a20lime.conf       |  4 ++--
 conf/machine/olinuxino-a20lime2-emmc.conf |  2 +-
 conf/machine/olinuxino-a20lime2.conf      |  2 +-
 conf/machine/olinuxino-a20som.conf        |  2 +-
 conf/machine/orange-pi-lite.conf          |  3 +--
 conf/machine/orange-pi-one.conf           |  3 +--
 conf/machine/orange-pi-pc-plus.conf       |  3 +--
 conf/machine/orange-pi-pc.conf            |  3 +--
 conf/machine/orange-pi-r1.conf            |  3 +--
 conf/machine/orange-pi-zero-plus2-h3.conf |  2 +-
 conf/machine/orange-pi-zero.conf          |  3 +--
 conf/machine/pcduino.conf                 |  2 +-
 conf/machine/pcduino3.conf                |  4 ++--
 recipes-kernel/linux/linux-mainline.inc   | 18 ------------------
 40 files changed, 48 insertions(+), 97 deletions(-)

diff --git a/conf/machine/bananapi-m2-berry.conf b/conf/machine/bananapi-m2-berry.conf
index a3fe349..4e46d03 100644
--- a/conf/machine/bananapi-m2-berry.conf
+++ b/conf/machine/bananapi-m2-berry.conf
@@ -5,5 +5,5 @@
 require conf/machine/include/sun8i.inc
 require conf/machine/include/hardware/ap6212a.inc
 
-KERNEL_DEVICETREE = "sun8i-v40-bananapi-m2-berry.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-v40-bananapi-m2-berry.dtb"
 UBOOT_MACHINE = "bananapi_m2_berry_defconfig"
diff --git a/conf/machine/bananapi-m2-zero.conf b/conf/machine/bananapi-m2-zero.conf
index ab8cfa1..6969f04 100644
--- a/conf/machine/bananapi-m2-zero.conf
+++ b/conf/machine/bananapi-m2-zero.conf
@@ -5,6 +5,5 @@
 require conf/machine/include/sun8i.inc
 require conf/machine/include/hardware/ap6212a.inc
 
-KERNEL_DEVICETREE = "sun8i-h2-plus-bananapi-m2-zero.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h2-plus-bananapi-m2-zero.dtb"
 UBOOT_MACHINE = "bananapi_m2_zero_defconfig"
-
diff --git a/conf/machine/bananapi-m2m.conf b/conf/machine/bananapi-m2m.conf
index 9bf2461..bcd7515 100644
--- a/conf/machine/bananapi-m2m.conf
+++ b/conf/machine/bananapi-m2m.conf
@@ -4,6 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-r16-bananapi-m2m.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-r16-bananapi-m2m.dtb"
 UBOOT_MACHINE = "Bananapi_m2m_defconfig"
-
diff --git a/conf/machine/bananapi-m2plus.conf b/conf/machine/bananapi-m2plus.conf
index eedb54f..4e91beb 100644
--- a/conf/machine/bananapi-m2plus.conf
+++ b/conf/machine/bananapi-m2plus.conf
@@ -4,6 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h3-bananapi-m2-plus.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-bananapi-m2-plus.dtb"
 UBOOT_MACHINE = "bananapi_m2_plus_h3_defconfig"
-
diff --git a/conf/machine/bananapi.conf b/conf/machine/bananapi.conf
index 581efd0..202ddf9 100644
--- a/conf/machine/bananapi.conf
+++ b/conf/machine/bananapi.conf
@@ -4,6 +4,6 @@
 
 require conf/machine/include/sun7i.inc
 
-KERNEL_DEVICETREE = "sun7i-a20-bananapi.dtb"
+KERNEL_DEVICETREE = "allwinner/sun7i-a20-bananapi.dtb"
 UBOOT_MACHINE = "Bananapi_config"
-SUNXI_FEX_FILE = "sys_config/a20/Bananapi.fex"
\ No newline at end of file
+SUNXI_FEX_FILE = "sys_config/a20/Bananapi.fex"
diff --git a/conf/machine/cubieboard.conf b/conf/machine/cubieboard.conf
index 0862823..a3f2784 100644
--- a/conf/machine/cubieboard.conf
+++ b/conf/machine/cubieboard.conf
@@ -4,6 +4,6 @@
 
 require conf/machine/include/sun4i.inc
 
-KERNEL_DEVICETREE = "sun4i-a10-cubieboard.dtb"
+KERNEL_DEVICETREE = "allwinner/sun4i-a10-cubieboard.dtb"
 UBOOT_MACHINE = "Cubieboard_config"
 SUNXI_FEX_FILE = "sys_config/a10/cubieboard.fex"
diff --git a/conf/machine/cubieboard2.conf b/conf/machine/cubieboard2.conf
index 4e3114f..7952c0f 100644
--- a/conf/machine/cubieboard2.conf
+++ b/conf/machine/cubieboard2.conf
@@ -4,6 +4,6 @@
 
 require conf/machine/include/sun7i.inc
 
-KERNEL_DEVICETREE = "sun7i-a20-cubieboard2.dtb"
+KERNEL_DEVICETREE = "allwinner/sun7i-a20-cubieboard2.dtb"
 UBOOT_MACHINE = "Cubieboard2_config"
 SUNXI_FEX_FILE = "sys_config/a20/cubieboard2.fex"
diff --git a/conf/machine/cubieboard4.conf b/conf/machine/cubieboard4.conf
index ceb6168..95a8eb3 100644
--- a/conf/machine/cubieboard4.conf
+++ b/conf/machine/cubieboard4.conf
@@ -7,5 +7,5 @@ require conf/machine/include/hardware/ap6330.inc
 
 KERNEL_IMAGETYPE = "zImage"
 
-KERNEL_DEVICETREE = "sun9i-a80-cubieboard4.dtb"
+KERNEL_DEVICETREE = "allwinner/sun9i-a80-cubieboard4.dtb"
 UBOOT_MACHINE = "Cubieboard4_defconfig"
diff --git a/conf/machine/cubietruck.conf b/conf/machine/cubietruck.conf
index 4e16a10..dbd6dce 100644
--- a/conf/machine/cubietruck.conf
+++ b/conf/machine/cubietruck.conf
@@ -4,6 +4,6 @@
 
 require conf/machine/include/sun7i.inc
 
-KERNEL_DEVICETREE = "sun7i-a20-cubietruck.dtb"
+KERNEL_DEVICETREE = "allwinner/sun7i-a20-cubietruck.dtb"
 UBOOT_MACHINE = "Cubietruck_config"
-SUNXI_FEX_FILE = "sys_config/a20/cubietruck.fex"
\ No newline at end of file
+SUNXI_FEX_FILE = "sys_config/a20/cubietruck.fex"
diff --git a/conf/machine/include/sunxi.inc b/conf/machine/include/sunxi.inc
index f7964f1..b2ba0ef 100644
--- a/conf/machine/include/sunxi.inc
+++ b/conf/machine/include/sunxi.inc
@@ -40,7 +40,7 @@ SUNXI_FEX_FILE ?= " "
 SUNXI_BOOT_SPACE ?= "40"
 IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} boot.scr"
 # ship fex file for sunxi kernel, devicetree file for mainline kernel
-IMAGE_BOOT_FILES += "${@bb.utils.contains('PREFERRED_PROVIDER_virtual/kernel', 'linux-sunxi', '${SUNXI_FEX_FILE}', '${KERNEL_DEVICETREE}', d)}"
+IMAGE_BOOT_FILES += "${@bb.utils.contains('PREFERRED_PROVIDER_virtual/kernel', 'linux-sunxi', '${SUNXI_FEX_FILE}', d.getVar('KERNEL_DEVICETREE', '').split('/')[-1], d)}"
 WKS_FILES ?= "sunxi-sdcard-image.wks.in"
 WKS_FILE_DEPENDS ?= "virtual/kernel u-boot"
 # in case of sunxi kernel, sunxi-board-fex must be built prior wic image assembly
diff --git a/conf/machine/include/sunxi64.inc b/conf/machine/include/sunxi64.inc
index 97bc67e..35a2bb9 100644
--- a/conf/machine/include/sunxi64.inc
+++ b/conf/machine/include/sunxi64.inc
@@ -25,28 +25,8 @@ SPL_BINARY ?= "u-boot-sunxi-with-spl.bin"
 SERIAL_CONSOLES ?= "115200;ttyS0"
 MACHINE_FEATURES ?= "alsa apm keyboard rtc serial screen usbgadget usbhost vfat"
 
-# arm64 dbts are under <vendor>/dts but is deployed under DEPLOYDIR 
-do_fix_device_tree_location() {
-
-    for kdt in ${KERNEL_DEVICETREE}
-    do
-        local dbt_dir=$(dirname ${kdt})
-        if [ "." != "${dbt_dir}" ] ; then
-            local dbt=$(basename ${kdt})
-            local dst=${DEPLOY_DIR_IMAGE}/${dbt_dir}/${dbt}
-            if [ ! -f ${dst} ] ; then
-                mkdir -p ${DEPLOY_DIR_IMAGE}/$dbt_dir
-                ln -s ${DEPLOY_DIR_IMAGE}/${dbt} ${dst}
-            fi
-        fi
-    done
-}
-
-
-addtask do_fix_device_tree_location after do_write_wks_template before do_image_wic
-
 SUNXI_BOOT_SPACE ?= "40"
-IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} boot.scr ${KERNEL_DEVICETREE}"
+IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} boot.scr ${@d.getVar('KERNEL_DEVICETREE', '').split('/')[-1]}"
 
 WKS_FILES ?= "sunxi-sdcard-image.wks.in"
 WKS_FILE_DEPENDS ?= "virtual/kernel u-boot"
diff --git a/conf/machine/lamobo-r1.conf b/conf/machine/lamobo-r1.conf
index 7985ba6..14bc13a 100644
--- a/conf/machine/lamobo-r1.conf
+++ b/conf/machine/lamobo-r1.conf
@@ -5,6 +5,6 @@
 require conf/machine/include/sun7i.inc
 
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree"
-KERNEL_DEVICETREE = "sun7i-a20-lamobo-r1.dtb"
+KERNEL_DEVICETREE = "allwinner/sun7i-a20-lamobo-r1.dtb"
 UBOOT_MACHINE = "Lamobo_R1_config"
 SUNXI_FEX_FILE = "sys_config/a20/lamobo-r1.fex"
diff --git a/conf/machine/licheepi-zero.conf b/conf/machine/licheepi-zero.conf
index a05bd49..1f4b933 100644
--- a/conf/machine/licheepi-zero.conf
+++ b/conf/machine/licheepi-zero.conf
@@ -6,4 +6,4 @@ require conf/machine/include/sun8i.inc
 
 
 UBOOT_MACHINE = "LicheePi_Zero_defconfig"
-KERNEL_DEVICETREE = "sun8i-v3s-licheepi-zero.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-v3s-licheepi-zero.dtb"
diff --git a/conf/machine/mangopi-mq-t-t113.conf b/conf/machine/mangopi-mq-t-t113.conf
index 006618f..7d636b3 100644
--- a/conf/machine/mangopi-mq-t-t113.conf
+++ b/conf/machine/mangopi-mq-t-t113.conf
@@ -4,7 +4,7 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-t113s-mangopi-mq-r-t113.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-t113s-mangopi-mq-r-t113.dtb"
 KERNEL_IMAGETYPE = "zImage"
 
 UBOOT_MACHINE = "mangopi_mq_r_defconfig"
diff --git a/conf/machine/marsboard-a10.conf b/conf/machine/marsboard-a10.conf
index 222f4b0..21ba7c8 100644
--- a/conf/machine/marsboard-a10.conf
+++ b/conf/machine/marsboard-a10.conf
@@ -5,6 +5,6 @@
 
 require conf/machine/include/sun4i.inc
 
-KERNEL_DEVICETREE = "sun4i-a10-marsboard.dtb"
+KERNEL_DEVICETREE = "allwinner/sun4i-a10-marsboard.dtb"
 UBOOT_MACHINE = "Marsboard_A10_config"
 SUNXI_FEX_FILE = "sys_config/a10/marsboard_a10.fex"
diff --git a/conf/machine/mele.conf b/conf/machine/mele.conf
index 6f31c51..9aef9ed 100644
--- a/conf/machine/mele.conf
+++ b/conf/machine/mele.conf
@@ -4,6 +4,6 @@
 
 require conf/machine/include/sun4i.inc
 
-KERNEL_DEVICETREE = "sun4i-a10-a1000.dtb"
+KERNEL_DEVICETREE = "allwinner/sun4i-a10-a1000.dtb"
 UBOOT_MACHINE = "Mele_A1000_config"
-SUNXI_FEX_FILE = "sys_config/a10/mele_a1000.fex"
\ No newline at end of file
+SUNXI_FEX_FILE = "sys_config/a10/mele_a1000.fex"
diff --git a/conf/machine/merrii-a80-optimus.conf b/conf/machine/merrii-a80-optimus.conf
index 48ae08e..edb5d1b 100644
--- a/conf/machine/merrii-a80-optimus.conf
+++ b/conf/machine/merrii-a80-optimus.conf
@@ -7,5 +7,5 @@ require conf/machine/include/hardware/ap6330.inc
 
 KERNEL_IMAGETYPE = "zImage"
 
-KERNEL_DEVICETREE = "sun9i-a80-optimus.dtb"
+KERNEL_DEVICETREE = "allwinner/sun9i-a80-optimus.dtb"
 UBOOT_MACHINE = "Merrii_A80_Optimus_defconfig"
diff --git a/conf/machine/nanopi-m1-plus.conf b/conf/machine/nanopi-m1-plus.conf
index a9ccdf5..37ef5db 100644
--- a/conf/machine/nanopi-m1-plus.conf
+++ b/conf/machine/nanopi-m1-plus.conf
@@ -4,6 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h3-nanopi-m1-plus.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-nanopi-m1-plus.dtb"
 UBOOT_MACHINE = "nanopi_m1_plus_defconfig"
-
diff --git a/conf/machine/nanopi-m1.conf b/conf/machine/nanopi-m1.conf
index de96acf..b88bb87 100644
--- a/conf/machine/nanopi-m1.conf
+++ b/conf/machine/nanopi-m1.conf
@@ -4,5 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h3-nanopi-m1.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-nanopi-m1.dtb"
 UBOOT_MACHINE = "nanopi_m1_defconfig"
diff --git a/conf/machine/nanopi-neo-air.conf b/conf/machine/nanopi-neo-air.conf
index d18f13c..17c7bdb 100644
--- a/conf/machine/nanopi-neo-air.conf
+++ b/conf/machine/nanopi-neo-air.conf
@@ -5,5 +5,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo-air.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-nanopi-neo-air.dtb"
 UBOOT_MACHINE = "nanopi_neo_air_defconfig"
diff --git a/conf/machine/nanopi-neo.conf b/conf/machine/nanopi-neo.conf
index b644f97..e1ad007 100644
--- a/conf/machine/nanopi-neo.conf
+++ b/conf/machine/nanopi-neo.conf
@@ -4,6 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-nanopi-neo.dtb"
 UBOOT_MACHINE = "nanopi_neo_defconfig"
-
diff --git a/conf/machine/nanopi-r1.conf b/conf/machine/nanopi-r1.conf
index 8f5911c..7a0672e 100644
--- a/conf/machine/nanopi-r1.conf
+++ b/conf/machine/nanopi-r1.conf
@@ -4,5 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h3-nanopi-r1.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-nanopi-r1.dtb"
 UBOOT_MACHINE = "nanopi_r1_defconfig"
diff --git a/conf/machine/olinuxino-a10lime.conf b/conf/machine/olinuxino-a10lime.conf
index 6827e17..43c39e1 100644
--- a/conf/machine/olinuxino-a10lime.conf
+++ b/conf/machine/olinuxino-a10lime.conf
@@ -5,6 +5,6 @@
 
 require conf/machine/include/sun4i.inc
 
-KERNEL_DEVICETREE = "sun4i-a10-olinuxino-lime.dtb"
+KERNEL_DEVICETREE = "allwinner/sun4i-a10-olinuxino-lime.dtb"
 UBOOT_MACHINE = "A10-OLinuXino-Lime_config"
-SUNXI_FEX_FILE = "sys_config/a10/a10-olinuxino-lime.fex"
\ No newline at end of file
+SUNXI_FEX_FILE = "sys_config/a10/a10-olinuxino-lime.fex"
diff --git a/conf/machine/olinuxino-a10s.conf b/conf/machine/olinuxino-a10s.conf
index dd63825..931ac17 100644
--- a/conf/machine/olinuxino-a10s.conf
+++ b/conf/machine/olinuxino-a10s.conf
@@ -5,6 +5,6 @@
 
 require conf/machine/include/sun5i.inc
 
-KERNEL_DEVICETREE = "sun5i-a10s-olinuxino-micro.dtb"
+KERNEL_DEVICETREE = "allwinner/sun5i-a10s-olinuxino-micro.dtb"
 UBOOT_MACHINE = "A10s-OLinuXino-M_config"
-SUNXI_FEX_FILE = "sys_config/a10s/a10s-olinuxino-m.fex"
\ No newline at end of file
+SUNXI_FEX_FILE = "sys_config/a10s/a10s-olinuxino-m.fex"
diff --git a/conf/machine/olinuxino-a13.conf b/conf/machine/olinuxino-a13.conf
index d73f622..4b81cbf 100644
--- a/conf/machine/olinuxino-a13.conf
+++ b/conf/machine/olinuxino-a13.conf
@@ -5,6 +5,6 @@
 
 require conf/machine/include/sun5i.inc
 
-KERNEL_DEVICETREE = "sun5i-a13-olinuxino.dtb"
+KERNEL_DEVICETREE = "allwinner/sun5i-a13-olinuxino.dtb"
 UBOOT_MACHINE = "A13-OLinuXino_config"
-SUNXI_FEX_FILE = "sys_config/a13/a13-olinuxino.fex"
\ No newline at end of file
+SUNXI_FEX_FILE = "sys_config/a13/a13-olinuxino.fex"
diff --git a/conf/machine/olinuxino-a20.conf b/conf/machine/olinuxino-a20.conf
index fc6620d..a5f42d9 100644
--- a/conf/machine/olinuxino-a20.conf
+++ b/conf/machine/olinuxino-a20.conf
@@ -5,6 +5,6 @@
 
 require conf/machine/include/sun7i.inc
 
-KERNEL_DEVICETREE = "sun7i-a20-olinuxino-micro.dtb"
+KERNEL_DEVICETREE = "allwinner/sun7i-a20-olinuxino-micro.dtb"
 UBOOT_MACHINE = "A20-OLinuXino_MICRO_config"
-SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_micro.fex"
\ No newline at end of file
+SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_micro.fex"
diff --git a/conf/machine/olinuxino-a20lime.conf b/conf/machine/olinuxino-a20lime.conf
index aaa6dac..f2823b7 100644
--- a/conf/machine/olinuxino-a20lime.conf
+++ b/conf/machine/olinuxino-a20lime.conf
@@ -5,6 +5,6 @@
 
 require conf/machine/include/sun7i.inc
 
-KERNEL_DEVICETREE = "sun7i-a20-olinuxino-lime.dtb"
+KERNEL_DEVICETREE = "allwinner/sun7i-a20-olinuxino-lime.dtb"
 UBOOT_MACHINE = "A20-OLinuXino-Lime_config"
-SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_lime.fex"
\ No newline at end of file
+SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_lime.fex"
diff --git a/conf/machine/olinuxino-a20lime2-emmc.conf b/conf/machine/olinuxino-a20lime2-emmc.conf
index 1b61c19..351120d 100644
--- a/conf/machine/olinuxino-a20lime2-emmc.conf
+++ b/conf/machine/olinuxino-a20lime2-emmc.conf
@@ -5,6 +5,6 @@
 
 require conf/machine/include/sun7i.inc
 
-KERNEL_DEVICETREE = "sun7i-a20-olinuxino-lime2-emmc.dtb"
+KERNEL_DEVICETREE = "allwinner/sun7i-a20-olinuxino-lime2-emmc.dtb"
 UBOOT_MACHINE = "A20-OLinuXino-Lime2-eMMC_config"
 SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_lime2.fex"
diff --git a/conf/machine/olinuxino-a20lime2.conf b/conf/machine/olinuxino-a20lime2.conf
index 837f43f..923b8c8 100644
--- a/conf/machine/olinuxino-a20lime2.conf
+++ b/conf/machine/olinuxino-a20lime2.conf
@@ -5,6 +5,6 @@
 
 require conf/machine/include/sun7i.inc
 
-KERNEL_DEVICETREE = "sun7i-a20-olinuxino-lime2.dtb"
+KERNEL_DEVICETREE = "allwinner/sun7i-a20-olinuxino-lime2.dtb"
 UBOOT_MACHINE = "A20-OLinuXino-Lime2_config"
 SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_lime2.fex"
diff --git a/conf/machine/olinuxino-a20som.conf b/conf/machine/olinuxino-a20som.conf
index 7b94a57..3211b0b 100644
--- a/conf/machine/olinuxino-a20som.conf
+++ b/conf/machine/olinuxino-a20som.conf
@@ -5,6 +5,6 @@
 
 require conf/machine/include/sun7i.inc
 
-KERNEL_DEVICETREE = "sun7i-a20-olimex-som-evb.dtb"
+KERNEL_DEVICETREE = "allwinner/sun7i-a20-olimex-som-evb.dtb"
 UBOOT_MACHINE = "A20-Olimex-SOM-EVB_config"
 SUNXI_FEX_FILE = "sys_config/a20/olimex_a20_som.fex"
diff --git a/conf/machine/orange-pi-lite.conf b/conf/machine/orange-pi-lite.conf
index f7ad588..b3f3c06 100644
--- a/conf/machine/orange-pi-lite.conf
+++ b/conf/machine/orange-pi-lite.conf
@@ -4,6 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h3-orangepi-lite.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-orangepi-lite.dtb"
 UBOOT_MACHINE = "orangepi_lite_defconfig"
-
diff --git a/conf/machine/orange-pi-one.conf b/conf/machine/orange-pi-one.conf
index de0d20f..eba45cc 100644
--- a/conf/machine/orange-pi-one.conf
+++ b/conf/machine/orange-pi-one.conf
@@ -4,6 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h3-orangepi-one.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-orangepi-one.dtb"
 UBOOT_MACHINE = "orangepi_one_defconfig"
-
diff --git a/conf/machine/orange-pi-pc-plus.conf b/conf/machine/orange-pi-pc-plus.conf
index 914ccf7..ab68dbc 100644
--- a/conf/machine/orange-pi-pc-plus.conf
+++ b/conf/machine/orange-pi-pc-plus.conf
@@ -4,6 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h3-orangepi-pc-plus.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-orangepi-pc-plus.dtb"
 UBOOT_MACHINE = "orangepi_pc_plus_defconfig"
-
diff --git a/conf/machine/orange-pi-pc.conf b/conf/machine/orange-pi-pc.conf
index eb70d88..6440e88 100644
--- a/conf/machine/orange-pi-pc.conf
+++ b/conf/machine/orange-pi-pc.conf
@@ -4,6 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h3-orangepi-pc.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-orangepi-pc.dtb"
 UBOOT_MACHINE = "orangepi_pc_defconfig"
-
diff --git a/conf/machine/orange-pi-r1.conf b/conf/machine/orange-pi-r1.conf
index 78d167b..3453749 100644
--- a/conf/machine/orange-pi-r1.conf
+++ b/conf/machine/orange-pi-r1.conf
@@ -4,6 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h2-plus-orangepi-r1.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h2-plus-orangepi-r1.dtb"
 UBOOT_MACHINE = "orangepi_r1_defconfig"
-
diff --git a/conf/machine/orange-pi-zero-plus2-h3.conf b/conf/machine/orange-pi-zero-plus2-h3.conf
index af1ff69..badc7c9 100644
--- a/conf/machine/orange-pi-zero-plus2-h3.conf
+++ b/conf/machine/orange-pi-zero-plus2-h3.conf
@@ -5,5 +5,5 @@
 require conf/machine/include/sun8i.inc
 require conf/machine/include/hardware/ap6212a.inc
 
-KERNEL_DEVICETREE = "sun8i-h3-orangepi-zero-plus2.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-orangepi-zero-plus2.dtb"
 UBOOT_MACHINE = "orangepi_zero_plus2_h3_defconfig"
diff --git a/conf/machine/orange-pi-zero.conf b/conf/machine/orange-pi-zero.conf
index 60249ee..daaaf7d 100644
--- a/conf/machine/orange-pi-zero.conf
+++ b/conf/machine/orange-pi-zero.conf
@@ -4,6 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h2-plus-orangepi-zero.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h2-plus-orangepi-zero.dtb"
 UBOOT_MACHINE = "orangepi_zero_defconfig"
-
diff --git a/conf/machine/pcduino.conf b/conf/machine/pcduino.conf
index 8adb51e..8825f81 100644
--- a/conf/machine/pcduino.conf
+++ b/conf/machine/pcduino.conf
@@ -4,6 +4,6 @@
 
 require conf/machine/include/sun4i.inc
 
-KERNEL_DEVICETREE = "sun4i-a10-pcduino.dtb"
+KERNEL_DEVICETREE = "allwinner/sun4i-a10-pcduino.dtb"
 UBOOT_MACHINE = "Linksprite_pcDuino_defconfig"
 SUNXI_FEX_FILE = "sys_config/a10/pcduino.fex"
diff --git a/conf/machine/pcduino3.conf b/conf/machine/pcduino3.conf
index 2ea2492..f91f405 100644
--- a/conf/machine/pcduino3.conf
+++ b/conf/machine/pcduino3.conf
@@ -4,6 +4,6 @@
 
 require conf/machine/include/sun7i.inc
 
-KERNEL_DEVICETREE = "sun7i-a20-pcduino3.dtb"
+KERNEL_DEVICETREE = "allwinner/sun7i-a20-pcduino3.dtb"
 UBOOT_MACHINE = "Linksprite_pcDuino3_defconfig"
-SUNXI_FEX_FILE = "sys_config/a20/linksprite_pcduino3.fex"
\ No newline at end of file
+SUNXI_FEX_FILE = "sys_config/a20/linksprite_pcduino3.fex"
diff --git a/recipes-kernel/linux/linux-mainline.inc b/recipes-kernel/linux/linux-mainline.inc
index 3d6db8d..6d7911a 100644
--- a/recipes-kernel/linux/linux-mainline.inc
+++ b/recipes-kernel/linux/linux-mainline.inc
@@ -9,24 +9,6 @@ require linux.inc
 
 LINUX_VERSION = "${PV}"
 
-KERNEL_DTB_PREFIX = "0"
-
-python() {
-    # return version in int form
-    def kernel_version():
-        ver = d.getVar('PV', True).split('.')
-        return int("".join(ver[0])),int("".join(ver[1]))
-
-    # kernel 6.5 have updated dts path add 'allwinner' prefix automatically
-    major, minor = kernel_version()
-    if major >= 6 and minor >= 5:
-        dt = d.getVar('KERNEL_DEVICETREE', True)
-        if not "allwinner" in dt:
-            dt = "allwinner/{0}".format(dt)
-            d.setVar('KERNEL_DEVICETREE', dt)
-        d.setVar('KERNEL_DTB_PREFIX', "1")
-}
-
 # Since we're not using git, this doesn't make a difference, but we need to fill
 # in something or kernel-yocto.bbclass will fail.
 KBRANCH ?= "master"