[PATCH] include: env: ti: default_findfdt: Follow the bootstd/distro conventions

Nishanth Menon nm at ti.com
Wed Dec 27 14:08:37 CET 2023


Distroboot and bootstd both mandate a findfdt variable pointing to the
correct device tree blob. Current mechanism calls a find_fdt function
to set this variable. We do not need a find_fdt command to set the
environment variable to a single dtb. Simplify the default_findfdt to
remove variable expansion while at it.

For legacy scripts depending on a TI convention of name_fdt, provide a
find_fdt wrapper that behaves like before.

NOTE: As part of this change, we also drop the cooked up
default_device_tree_arch default_device_tree_subarch variables.

Reported-by: Jonathan Humphreys <j-humphreys at ti.com>
Signed-off-by: Nishanth Menon <nm at ti.com>
---
 include/env/ti/default_findfdt.env | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/include/env/ti/default_findfdt.env b/include/env/ti/default_findfdt.env
index a2b51dd923bb..1a1ab8406c9e 100644
--- a/include/env/ti/default_findfdt.env
+++ b/include/env/ti/default_findfdt.env
@@ -1,12 +1,7 @@
-default_device_tree=CONFIG_DEFAULT_DEVICE_TREE
-default_device_tree_arch=ti
 #ifdef CONFIG_ARM64
-findfdt=
-	setenv name_fdt ${default_device_tree_arch}/${default_device_tree}.dtb;
-	setenv fdtfile ${name_fdt}
+fdtfile=ti/CONFIG_DEFAULT_DEVICE_TREE.dtb;
 #else
-default_device_tree_subarch=omap
-findfdt=
-	setenv name_fdt ${default_device_tree_arch}/${default_device_tree_subarch}/${default_device_tree}.dtb;
-	setenv fdtfile ${name_fdt}
+fdtfile=ti/omap/CONFIG_DEFAULT_DEVICE_TREE.dtb;
 #endif
+
+findfdt=setenv name_fdt ${fdt_file}
-- 
2.43.0



More information about the U-Boot mailing list