diff --git a/meta-amd/meta-daytonax/conf/machine/daytonax.conf b/meta-amd/meta-daytonax/conf/machine/daytonax.conf
index cd7af72..59ec62b 100644
--- a/meta-amd/meta-daytonax/conf/machine/daytonax.conf
+++ b/meta-amd/meta-daytonax/conf/machine/daytonax.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-amd-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-amd-${MACHINE}.dtb"
 
 UBOOT_DEVICETREE = "ast2500-evb"
 UBOOT_MACHINE = "evb-ast2500_defconfig"
diff --git a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf
index d84e648..c252478 100644
--- a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf
+++ b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-amd-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-amd-${MACHINE}.dtb"
 
 UBOOT_DEVICETREE = "ast2500-evb"
 UBOOT_MACHINE = "evb-ast2500_defconfig"
diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf
index f1e51bb..79f1ee6 100644
--- a/meta-ampere/meta-jade/conf/machine/mtjade.conf
+++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-ampere-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-ampere-${MACHINE}.dtb"
 
 UBOOT_MACHINE = "evb-ast2500_defconfig"
 UBOOT_DEVICETREE = "ast2500-evb"
diff --git a/meta-ampere/meta-mitchell/conf/machine/mtmitchell.conf b/meta-ampere/meta-mitchell/conf/machine/mtmitchell.conf
index 74f4e19..13598dc 100644
--- a/meta-ampere/meta-mitchell/conf/machine/mtmitchell.conf
+++ b/meta-ampere/meta-mitchell/conf/machine/mtmitchell.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-ampere-mtmitchell.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-ampere-mtmitchell.dtb"
 UBOOT_DEVICETREE = "ast2600-bletchley"
 UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig"
 SPL_BINARY = "spl/u-boot-spl.bin"
diff --git a/meta-aspeed/conf/machine/evb-ast2500.conf b/meta-aspeed/conf/machine/evb-ast2500.conf
index 4de380f..14a14c8 100644
--- a/meta-aspeed/conf/machine/evb-ast2500.conf
+++ b/meta-aspeed/conf/machine/evb-ast2500.conf
@@ -1,4 +1,4 @@
-KERNEL_DEVICETREE = "aspeed-ast2500-evb.dtb"
+KERNEL_DEVICETREE = "aspeed/aspeed-ast2500-evb.dtb"
 
 UBOOT_MACHINE = "evb-ast2500_defconfig"
 UBOOT_DEVICETREE = "ast2500-evb"
diff --git a/meta-aspeed/conf/machine/evb-ast2600.conf b/meta-aspeed/conf/machine/evb-ast2600.conf
index 9b54658..7dd4489 100644
--- a/meta-aspeed/conf/machine/evb-ast2600.conf
+++ b/meta-aspeed/conf/machine/evb-ast2600.conf
@@ -1,4 +1,4 @@
-KERNEL_DEVICETREE = "aspeed-ast2600-evb.dtb"
+KERNEL_DEVICETREE = "aspeed/aspeed-ast2600-evb.dtb"
 
 UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig"
 UBOOT_DEVICETREE = "ast2600-evb"
diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
index 12ca76c..92b8df0 100644
--- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
+++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
@@ -1,6 +1,6 @@
-KBRANCH ?= "dev-6.1"
-LINUX_VERSION ?= "6.1.51"
+KBRANCH ?= "dev-6.5"
+LINUX_VERSION ?= "6.5.4"
 
-SRCREV="6f8bb353a755ae9f4985b3c084d4d1be62782baf"
+SRCREV="12f22df3cc2f6230ac91e574c1b63b872ea1a6a7"
 
 require linux-aspeed.inc
diff --git a/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf b/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf
index 8e0a022..0a67e78 100644
--- a/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf
+++ b/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-asrock-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-asrock-${MACHINE}.dtb"
 
 UBOOT_DEVICETREE = "ast2500-evb"
 UBOOT_MACHINE = "evb-ast2500_defconfig"
diff --git a/meta-asrock/meta-romed8hm3/conf/machine/romed8hm3.conf b/meta-asrock/meta-romed8hm3/conf/machine/romed8hm3.conf
index 00d8caa..8ff4d77 100644
--- a/meta-asrock/meta-romed8hm3/conf/machine/romed8hm3.conf
+++ b/meta-asrock/meta-romed8hm3/conf/machine/romed8hm3.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-asrock-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-asrock-${MACHINE}.dtb"
 
 UBOOT_DEVICETREE = "ast2500-evb"
 UBOOT_MACHINE = "evb-ast2500_defconfig"
diff --git a/meta-bytedance/meta-g220a/conf/machine/g220a.conf b/meta-bytedance/meta-g220a/conf/machine/g220a.conf
index 516e316..cfbf20e 100644
--- a/meta-bytedance/meta-g220a/conf/machine/g220a.conf
+++ b/meta-bytedance/meta-g220a/conf/machine/g220a.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-bytedance-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-bytedance-${MACHINE}.dtb"
 
 UBOOT_MACHINE = "evb-ast2500_defconfig"
 UBOOT_DEVICETREE = "ast2500-evb"
diff --git a/meta-delta/meta-ahe50dc/conf/machine/ahe50dc.conf b/meta-delta/meta-ahe50dc/conf/machine/ahe50dc.conf
index aa7e14c..f9467cd 100644
--- a/meta-delta/meta-ahe50dc/conf/machine/ahe50dc.conf
+++ b/meta-delta/meta-ahe50dc/conf/machine/ahe50dc.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-delta-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-delta-${MACHINE}.dtb"
 
 UBOOT_MACHINE = "evb-ast2400_defconfig"
 UBOOT_DEVICETREE = "ast2400-ahe-50dc"
diff --git a/meta-facebook/meta-bletchley/conf/machine/bletchley.conf b/meta-facebook/meta-bletchley/conf/machine/bletchley.conf
index 4890497..e8537a6 100644
--- a/meta-facebook/meta-bletchley/conf/machine/bletchley.conf
+++ b/meta-facebook/meta-bletchley/conf/machine/bletchley.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
 
 UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig"
 UBOOT_DEVICETREE = "ast2600-bletchley"
diff --git a/meta-facebook/meta-greatlakes/conf/machine/greatlakes.conf b/meta-facebook/meta-greatlakes/conf/machine/greatlakes.conf
index b26c88c..240de22 100644
--- a/meta-facebook/meta-greatlakes/conf/machine/greatlakes.conf
+++ b/meta-facebook/meta-greatlakes/conf/machine/greatlakes.conf
@@ -1,6 +1,5 @@
 KMACHINE = "aspeed"
-#KERNEL_DEVICETREE = "${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
-KERNEL_DEVICETREE = "aspeed-ast2600-evb.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
 
 UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig"
 UBOOT_DEVICETREE = "ast2600-evb"
diff --git a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
index 1bc1ea3..3454d85 100644
--- a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
+++ b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed-sdk"
 PREFERRED_PROVIDER_u-boot = "u-boot-aspeed-sdk"
diff --git a/meta-facebook/meta-yosemite4/conf/machine/yosemite4.conf b/meta-facebook/meta-yosemite4/conf/machine/yosemite4.conf
index 17d12e6..d8121d1 100644
--- a/meta-facebook/meta-yosemite4/conf/machine/yosemite4.conf
+++ b/meta-facebook/meta-yosemite4/conf/machine/yosemite4.conf
@@ -1,6 +1,5 @@
 KMACHINE = "aspeed"
-#KERNEL_DEVICETREE = "${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
-KERNEL_DEVICETREE = "aspeed-ast2600-evb.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
 
 UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig"
 UBOOT_DEVICETREE = "ast2600-evb"
diff --git a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf
index 3b5af1b..909956b 100644
--- a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf
+++ b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed-sdk"
 PREFERRED_PROVIDER_u-boot = "u-boot-aspeed-sdk"
diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf
index bf067c3..db60b24 100644
--- a/meta-ibm/conf/machine/p10bmc.conf
+++ b/meta-ibm/conf/machine/p10bmc.conf
@@ -5,10 +5,10 @@
 # than in the other systems. Otherwise the device driver would truncate the data
 # on that eeprom on a bonnell system.
 KERNEL_DEVICETREE = \
-    "aspeed-bmc-ibm-bonnell.dtb \
-     aspeed-bmc-ibm-rainier.dtb \
-     aspeed-bmc-ibm-rainier-4u.dtb \
-     aspeed-bmc-ibm-everest.dtb"
+    "aspeed/aspeed-bmc-ibm-bonnell.dtb \
+     aspeed/aspeed-bmc-ibm-rainier.dtb \
+     aspeed/aspeed-bmc-ibm-rainier-4u.dtb \
+     aspeed/aspeed-bmc-ibm-everest.dtb"
 UBOOT_MACHINE = "ast2600_openbmc_spl_emmc_defconfig"
 UBOOT_DEVICETREE = "ast2600-p10bmc"
 SPL_BINARY = "spl/u-boot-spl.bin"
@@ -79,7 +79,7 @@
 
 QB_ROOTFS_OPT:p10bmc="-drive file=@ROOTFS@,if=sd,format=qcow2,index=2"
 QB_MACHINE:p10bmc="-machine rainier-bmc"
-QB_DTB:p10bmc="aspeed-bmc-ibm-rainier.dtb"
+QB_DTB:p10bmc="aspeed/aspeed-bmc-ibm-rainier.dtb"
 QB_MEM:p10bmc="-m 1024"
 QB_DEFAULT_FSTYPE:p10bmc="wic.qcow2"
 QB_FSINFO = "wic:no-kernel-in-fs"
diff --git a/meta-ibm/conf/machine/swift.conf b/meta-ibm/conf/machine/swift.conf
index 8a7e24b..8290a44 100644
--- a/meta-ibm/conf/machine/swift.conf
+++ b/meta-ibm/conf/machine/swift.conf
@@ -2,7 +2,7 @@
 
 IMAGE_FSTYPES += "ext4 mmc-ext4-tar"
 
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
 PHOSPHOR_MRW_LICENSE = "Apache-2.0"
 PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
diff --git a/meta-ibm/conf/machine/witherspoon-tacoma.conf b/meta-ibm/conf/machine/witherspoon-tacoma.conf
index 4d80afb..4153e51 100644
--- a/meta-ibm/conf/machine/witherspoon-tacoma.conf
+++ b/meta-ibm/conf/machine/witherspoon-tacoma.conf
@@ -1,4 +1,4 @@
-KERNEL_DEVICETREE = "aspeed-bmc-opp-tacoma.dtb"
+KERNEL_DEVICETREE = "aspeed/aspeed-bmc-opp-tacoma.dtb"
 UBOOT_MACHINE = "ast2600_openbmc_spl_emmc_defconfig"
 UBOOT_DEVICETREE = "ast2600-tacoma"
 SPL_BINARY = "spl/u-boot-spl.bin"
diff --git a/meta-ibm/conf/machine/witherspoon.conf b/meta-ibm/conf/machine/witherspoon.conf
index 9b8e3f1..5a7c4cb 100644
--- a/meta-ibm/conf/machine/witherspoon.conf
+++ b/meta-ibm/conf/machine/witherspoon.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed"
 PREFERRED_PROVIDER_u-boot = "u-boot-aspeed"
diff --git a/meta-ibm/meta-palmetto/conf/machine/palmetto.conf b/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
index d34ed5a..71a67d9 100644
--- a/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
+++ b/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
 require conf/machine/include/ast2400.inc
 require conf/machine/include/obmc-bsp-common.inc
diff --git a/meta-ibm/meta-romulus/conf/machine/romulus.conf b/meta-ibm/meta-romulus/conf/machine/romulus.conf
index 46e42b6..bc2802c 100644
--- a/meta-ibm/meta-romulus/conf/machine/romulus.conf
+++ b/meta-ibm/meta-romulus/conf/machine/romulus.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
 UBOOT_MACHINE = "evb-ast2500_defconfig"
 UBOOT_DEVICETREE = "ast2500-romulus"
diff --git a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf
index 7bb0cf0..ab90a6a 100644
--- a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf
+++ b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed"
 PREFERRED_PROVIDER_u-boot = "u-boot-aspeed"
diff --git a/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf b/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf
index 5bc0b4d..691983e 100644
--- a/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf
+++ b/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-inspur-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-inspur-${MACHINE}.dtb"
 
 UBOOT_MACHINE = "evb-ast2500_defconfig"
 UBOOT_DEVICETREE = "ast2500-evb"
diff --git a/meta-inspur/meta-nf5280m7/conf/machine/nf5280m7.conf b/meta-inspur/meta-nf5280m7/conf/machine/nf5280m7.conf
index 10e3fd2..e54a56a 100644
--- a/meta-inspur/meta-nf5280m7/conf/machine/nf5280m7.conf
+++ b/meta-inspur/meta-nf5280m7/conf/machine/nf5280m7.conf
@@ -1,6 +1,6 @@
 # Add a device tree for nf5280m7
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-inspur-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-inspur-${MACHINE}.dtb"
 
 UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig"
 UMACHINE = "ast2600"
diff --git a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf
index 8fff0ad..6df560b 100644
--- a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf
+++ b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-inspur-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-inspur-${MACHINE}.dtb"
 
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc
diff --git a/meta-intel-openbmc/meta-s2600wf/conf/machine/s2600wf.conf b/meta-intel-openbmc/meta-s2600wf/conf/machine/s2600wf.conf
index a24cf75..0f6a7aa 100644
--- a/meta-intel-openbmc/meta-s2600wf/conf/machine/s2600wf.conf
+++ b/meta-intel-openbmc/meta-s2600wf/conf/machine/s2600wf.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-intel-s2600wf.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-intel-s2600wf.dtb"
 
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc
diff --git a/meta-inventec/meta-transformers/conf/machine/transformers.conf b/meta-inventec/meta-transformers/conf/machine/transformers.conf
index 24cc267..47b80be 100755
--- a/meta-inventec/meta-transformers/conf/machine/transformers.conf
+++ b/meta-inventec/meta-transformers/conf/machine/transformers.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-inventec-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-inventec-${MACHINE}.dtb"
 
 require conf/machine/include/ast2600.inc
 require conf/machine/include/obmc-bsp-common.inc
diff --git a/meta-qualcomm/conf/machine/qcom-dc-scm-v1.conf b/meta-qualcomm/conf/machine/qcom-dc-scm-v1.conf
index 0143b57..ff4048e 100644
--- a/meta-qualcomm/conf/machine/qcom-dc-scm-v1.conf
+++ b/meta-qualcomm/conf/machine/qcom-dc-scm-v1.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "aspeed-bmc-qcom-dc-scm-v1.dtb"
+KERNEL_DEVICETREE = "aspeed/aspeed-bmc-qcom-dc-scm-v1.dtb"
 UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig"
 UBOOT_DEVICETREE = "ast2600-qcom-dc-scm-v1"
 SPL_BINARY = "spl/u-boot-spl.bin"
diff --git a/meta-quanta/meta-f0b/conf/machine/f0b.conf b/meta-quanta/meta-f0b/conf/machine/f0b.conf
index af7302a..17a13ca 100644
--- a/meta-quanta/meta-f0b/conf/machine/f0b.conf
+++ b/meta-quanta/meta-f0b/conf/machine/f0b.conf
@@ -1,7 +1,7 @@
 KMACHINE = "aspeed"
 
 # The device tree of F0B is not ready yet, temporarily replace it with aspeed-ast2500-evb.dtb
-KERNEL_DEVICETREE = "${KMACHINE}-ast2500-evb.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-ast2500-evb.dtb"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed"
 PREFERRED_PROVIDER_u-boot = "u-boot-aspeed"
diff --git a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
index 373e828..e37b622 100644
--- a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
+++ b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-${MACHINE}.dtb"
 
 require conf/machine/include/ast2400.inc
 require conf/machine/include/obmc-bsp-common.inc
diff --git a/meta-quanta/meta-s6q/conf/machine/s6q.conf b/meta-quanta/meta-s6q/conf/machine/s6q.conf
index b57652f..aa9948d 100644
--- a/meta-quanta/meta-s6q/conf/machine/s6q.conf
+++ b/meta-quanta/meta-s6q/conf/machine/s6q.conf
@@ -1,6 +1,5 @@
 # KMACHINE = "aspeed"
-# KERNEL_DEVICETREE = "${KMACHINE}-bmc-quanta-${MACHINE}.dtb"
-KERNEL_DEVICETREE = "aspeed-ast2600-evb.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-quanta-${MACHINE}.dtb"
 
 UBOOT_MACHINE = "ast2600_openbmc_defconfig"
 UBOOT_DEVICETREE = "ast2600a1-evb"
diff --git a/meta-supermicro/meta-x11spi/conf/machine/x11spi.conf b/meta-supermicro/meta-x11spi/conf/machine/x11spi.conf
index 3cc2bec..46e2daa 100644
--- a/meta-supermicro/meta-x11spi/conf/machine/x11spi.conf
+++ b/meta-supermicro/meta-x11spi/conf/machine/x11spi.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "aspeed-bmc-supermicro-x11spi.dtb"
+KERNEL_DEVICETREE = "aspeed/aspeed-bmc-supermicro-x11spi.dtb"
 
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc
diff --git a/meta-tyan/meta-s7106/conf/machine/s7106.conf b/meta-tyan/meta-s7106/conf/machine/s7106.conf
index d78a501..57e19d3 100644
--- a/meta-tyan/meta-s7106/conf/machine/s7106.conf
+++ b/meta-tyan/meta-s7106/conf/machine/s7106.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-tyan-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-tyan-${MACHINE}.dtb"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed"
 PREFERRED_PROVIDER_u-boot = "u-boot-aspeed"
diff --git a/meta-tyan/meta-s8036/conf/machine/s8036.conf b/meta-tyan/meta-s8036/conf/machine/s8036.conf
index d78a501..57e19d3 100644
--- a/meta-tyan/meta-s8036/conf/machine/s8036.conf
+++ b/meta-tyan/meta-s8036/conf/machine/s8036.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-tyan-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-tyan-${MACHINE}.dtb"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed"
 PREFERRED_PROVIDER_u-boot = "u-boot-aspeed"
diff --git a/meta-ufispace/meta-ncplite/conf/machine/ncplite.conf b/meta-ufispace/meta-ncplite/conf/machine/ncplite.conf
index 00738fb..824d54a 100644
--- a/meta-ufispace/meta-ncplite/conf/machine/ncplite.conf
+++ b/meta-ufispace/meta-ncplite/conf/machine/ncplite.conf
@@ -1,6 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-ufispace-${MACHINE}.dtb"
-#KERNEL_DEVICETREE = "aspeed-ast2600-evb.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-ufispace-${MACHINE}.dtb"
 
 require conf/machine/include/ast2600.inc
 require conf/machine/include/obmc-bsp-common.inc
diff --git a/meta-wistron/meta-lannister/conf/machine/lannister.conf b/meta-wistron/meta-lannister/conf/machine/lannister.conf
index 5377db0..15be909 100644
--- a/meta-wistron/meta-lannister/conf/machine/lannister.conf
+++ b/meta-wistron/meta-lannister/conf/machine/lannister.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-wistron-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-wistron-${MACHINE}.dtb"
 
 require conf/machine/include/wistron.inc
 require conf/machine/include/ast2600.inc
diff --git a/meta-yadro/meta-nicole/conf/machine/nicole.conf b/meta-yadro/meta-nicole/conf/machine/nicole.conf
index fc4c487..6093972 100644
--- a/meta-yadro/meta-nicole/conf/machine/nicole.conf
+++ b/meta-yadro/meta-nicole/conf/machine/nicole.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed"
 PREFERRED_PROVIDER_u-boot = "u-boot-aspeed"
diff --git a/meta-yadro/meta-vegman/conf/machine/include/vegman.inc b/meta-yadro/meta-vegman/conf/machine/include/vegman.inc
index 994a88b..c7e3742 100644
--- a/meta-yadro/meta-vegman/conf/machine/include/vegman.inc
+++ b/meta-yadro/meta-vegman/conf/machine/include/vegman.inc
@@ -1,6 +1,6 @@
 OVERRIDES .= ":vegman"
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-${MACHINE}.dtb"
 UBOOT_MACHINE = "evb-ast2500_defconfig"
 UBOOT_DEVICETREE = "ast2500-evb"
 
diff --git a/meta-yadro/meta-vegman/conf/machine/tatlin-archive-x86.conf b/meta-yadro/meta-vegman/conf/machine/tatlin-archive-x86.conf
index 743b4e0..e6b56e7 100644
--- a/meta-yadro/meta-vegman/conf/machine/tatlin-archive-x86.conf
+++ b/meta-yadro/meta-vegman/conf/machine/tatlin-archive-x86.conf
@@ -2,4 +2,4 @@
 # Apply all the machine override from the VEGMAN Sx20, because
 # the TATLIN.ARCHIVE.xS have an exactly same hardware as the VEGMAN Sx20
 MACHINEOVERRIDES .= ":vegman-sx20"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-vegman-sx20.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-vegman-sx20.dtb"