Skip to contentSkip to conversation

conf: am57/am33/am43: Add/fix DEVICETREE_FILE

PATCH New Ryan Eatmon 1 participant 1 message Apr 26, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 conf: am57/am33/am43: Add/fix DEVICETREE_FILE

The new kernel directory stucture for the DTBs is causing problems when assembing the image files. It produces errors like this:

output: install: cannot stat 'deploy-ti/images/XXXX-evm/omap/XXXX.dtb': No such file or directory

or

output: install: cannot stat 'deploy-ti/images/XXXX-evm/ti/omap/XXXX.dtb': No such file or directory

The issue comes from the UBOOT_EXTLINUX_BOOT_FILES list. am57 already had a mechanism but it was missing the omap/ dir to remove, and am33 and am43 were just takeing KERNEL_DEVICETREE directly. This patch fixes both cases.

---
 meta-ti-bsp/conf/machine/include/omap-a15.inc | 2 +-
 meta-ti-bsp/conf/machine/include/ti33x.inc    | 4 +++-
 meta-ti-bsp/conf/machine/include/ti43x.inc    | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)
meta-ti-bsp/conf/machine/include/omap-a15.inc +1 -1
index 6187f2ea..a875713f 100644
@@ -24,7 +24,7 @@ UBOOT_ARCH = "arm"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
-DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/","")}"
+DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","").replace("ti/","")}"
 
 # Generate an extlinux.conf file
 UBOOT_EXTLINUX = "1"
meta-ti-bsp/conf/machine/include/ti33x.inc +3 -1
index 6cd7e568..b0ed1c69 100644
@@ -44,6 +44,8 @@ UBOOT_MACHINE = "am335x_evm_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
+DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","")}"
+
 # Generate an extlinux.conf file
 UBOOT_EXTLINUX = "1"
 UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
@@ -51,7 +53,7 @@ UBOOT_EXTLINUX_KERNEL_ARGS = "rootwait rw earlycon"
 UBOOT_EXTLINUX_BOOT_FILES = " \
     extlinux.conf;extlinux/extlinux.conf \
     ${KERNEL_IMAGETYPE} \
-    ${KERNEL_DEVICETREE} \
+    ${DEVICETREE_FILE} \
 "
 
 SPL_BINARY = "MLO"
meta-ti-bsp/conf/machine/include/ti43x.inc +3 -1
index ec4bd115..17ca5240 100644
@@ -41,13 +41,15 @@ UBOOT_MACHINE = "am43xx_evm_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
+DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","")}"
+
 # 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"
Signature · 1 line
2.17.1