From: Ryan Eatmon <reatmon@ti.com>
To: Praneeth Bajjuri <praneeth@ti.com>, Tom Rini <trini@konsulko.com>,
Andrew Davis <afd@ti.com>, Bryan Brattlof <bb@ti.com>,
<u-boot@lists.denx.de>
Subject: [PATCH] include: configs: Change dtb names in fitImage to match oe-core
Date: Thu, 30 Mar 2023 16:06:13 -0500 [thread overview]
Message-ID: <20230330210613.17984-1-reatmon@ti.com> (raw)
The oe-core class for assembling the fitImage includes the vendor
sub-directory (with the / changed to _) in the config sections of
the fitImage. Our env var settings for chosing which section to
boot from needs to be updated to agree with the fitImage.
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
include/configs/am64x_evm.h | 4 ++--
include/configs/am65x_evm.h | 2 +-
include/configs/j721e_evm.h | 6 +++---
include/configs/j721s2_evm.h | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h
index 26a7f2521e..456a44730c 100644
--- a/include/configs/am64x_evm.h
+++ b/include/configs/am64x_evm.h
@@ -26,9 +26,9 @@
#define EXTRA_ENV_AM642_BOARD_SETTINGS \
"findfdt=" \
"if test $board_name = am64x_gpevm; then " \
- "setenv fdtfile k3-am642-evm.dtb; fi; " \
+ "setenv fdtfile ti_k3-am642-evm.dtb; fi; " \
"if test $board_name = am64x_skevm; then " \
- "setenv fdtfile k3-am642-sk.dtb; fi;" \
+ "setenv fdtfile ti_k3-am642-sk.dtb; fi;" \
"if test $fdtfile = undefined; then " \
"echo WARNING: Could not determine device tree to use; fi; \0" \
"name_kern=Image\0" \
diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h
index 33dd6cfdfa..60a7eb1453 100644
--- a/include/configs/am65x_evm.h
+++ b/include/configs/am65x_evm.h
@@ -24,7 +24,7 @@
/* U-Boot general configuration */
#define EXTRA_ENV_AM65X_BOARD_SETTINGS \
"findfdt=" \
- "setenv name_fdt k3-am654-base-board.dtb;" \
+ "setenv name_fdt ti_k3-am654-base-board.dtb;" \
"setenv fdtfile ${name_fdt}\0" \
"name_kern=Image\0" \
"console=ttyS2,115200n8\0" \
diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h
index 48b1cea6e3..eac5cd5b76 100644
--- a/include/configs/j721e_evm.h
+++ b/include/configs/j721e_evm.h
@@ -34,11 +34,11 @@
#define EXTRA_ENV_J721E_BOARD_SETTINGS \
"default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
"findfdt=" \
- "setenv name_fdt ${default_device_tree};" \
+ "setenv name_fdt ti_${default_device_tree};" \
"if test $board_name = j721e; then " \
- "setenv name_fdt k3-j721e-common-proc-board.dtb; fi;" \
+ "setenv name_fdt ti_k3-j721e-common-proc-board.dtb; fi;" \
"if test $board_name = j721e-eaik || test $board_name = j721e-sk; then " \
- "setenv name_fdt k3-j721e-sk.dtb; fi;" \
+ "setenv name_fdt ti_k3-j721e-sk.dtb; fi;" \
"setenv fdtfile ${name_fdt}\0" \
"name_kern=Image\0" \
"console=ttyS2,115200n8\0" \
diff --git a/include/configs/j721s2_evm.h b/include/configs/j721s2_evm.h
index bfada9eebc..b30a4a8da4 100644
--- a/include/configs/j721s2_evm.h
+++ b/include/configs/j721s2_evm.h
@@ -31,11 +31,11 @@
#define EXTRA_ENV_J721S2_BOARD_SETTINGS \
"default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
"findfdt=" \
- "setenv name_fdt ${default_device_tree};" \
+ "setenv name_fdt ti_${default_device_tree};" \
"if test $board_name = j721s2; then " \
- "setenv name_fdt k3-j721s2-common-proc-board.dtb; fi;" \
+ "setenv name_fdt ti_k3-j721s2-common-proc-board.dtb; fi;" \
"if test $board_name = am68-sk; then " \
- "setenv name_fdt k3-am68-sk-base-board.dtb; fi;"\
+ "setenv name_fdt ti_k3-am68-sk-base-board.dtb; fi;"\
"setenv fdtfile ${name_fdt}\0" \
"name_kern=Image\0" \
"console=ttyS2,115200n8\0" \
--
2.17.1
next reply other threads:[~2023-03-30 21:52 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-30 21:06 Ryan Eatmon [this message]
2023-03-31 17:04 ` [PATCH] include: configs: Change dtb names in fitImage to match oe-core Nishanth Menon
2023-03-31 17:19 ` Andrew Davis
2023-03-31 18:11 ` Tom Rini
2023-03-31 18:23 ` Andrew Davis
2023-03-31 18:36 ` Tom Rini
2023-03-31 18:52 ` Andrew Davis
2023-03-31 19:06 ` Tom Rini
-- strict thread matches above, loose matches on Subject: below --
2023-03-30 20:55 Ryan Eatmon
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=20230330210613.17984-1-reatmon@ti.com \
--to=reatmon@ti.com \
--cc=afd@ti.com \
--cc=bb@ti.com \
--cc=praneeth@ti.com \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/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