From 537ef85437beef7684f1f919d7293fb6cd85ae7c Mon Sep 17 00:00:00 2001
From: Yogesh Siraswar <yogeshs@ti.com>
Date: Mon, 18 Oct 2021 22:10:34 +0000
Subject: [PATCH] conf: omap-a15: fix the dtb file path for extlinux boot

The uboot extlinux is using kernel device tree variable to populate the
dtb files. The error occurs if the device tree files are in ti folder
since there is no ti folder in deploy directory. Fix the kernel device
tree path before using in the uboot extlinux.

Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
---
 conf/machine/include/omap-a15.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/conf/machine/include/omap-a15.inc b/conf/machine/include/omap-a15.inc
index c95b0ccc..923a19d3 100644
--- a/conf/machine/include/omap-a15.inc
+++ b/conf/machine/include/omap-a15.inc
@@ -19,13 +19,15 @@ UBOOT_ARCH = "arm"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
+DEVICETREE_FILE = "${@d.getVar('KERNEL_DEVICETREE').replace("ti/","")}"
+
 # Generate an extlinux.conf file
 UBOOT_EXTLINUX = "1"
 UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
 UBOOT_EXTLINUX_BOOT_FILES = " \
     extlinux.conf;extlinux/extlinux.conf \
     ${KERNEL_IMAGETYPE} \
-    ${KERNEL_DEVICETREE} \
+    ${DEVICETREE_FILE} \
 "
 
 SPL_BINARY = "MLO"