From: Ryan Eatmon <reatmon@ti.com>
To: Praneeth Bajjuri <praneeth@ti.com>,
Denys Dmytriyenko <denys@konsulko.com>,
<meta-ti@lists.yoctoproject.org>
Subject: [meta-ti][master/scarthgap][PATCH] conf: am57/am33/am43: Add/fix DEVICETREE_FILE
Date: Fri, 26 Apr 2024 15:09:40 -0500 [thread overview]
Message-ID: <20240426200940.22326-1-reatmon@ti.com> (raw)
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.
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
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(-)
diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc
index 6187f2ea..a875713f 100644
--- a/meta-ti-bsp/conf/machine/include/omap-a15.inc
+++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc
@@ -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"
diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc
index 6cd7e568..b0ed1c69 100644
--- a/meta-ti-bsp/conf/machine/include/ti33x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti33x.inc
@@ -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"
diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc
index ec4bd115..17ca5240 100644
--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -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"
--
2.17.1
reply other threads:[~2024-04-26 20:09 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240426200940.22326-1-reatmon@ti.com \
--to=reatmon@ti.com \
--cc=denys@konsulko.com \
--cc=meta-ti@lists.yoctoproject.org \
--cc=praneeth@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).