[PATCH 07/18] environment: ti: Prefix ARM64 DTB names with directory

[Manorit Chawdhry]

From: Andrew Davis <afd at ti.com>

In Linux the ARM64 DTSs are stored in vendor directories to help organize
the files and prevent naming collisions. The deployed DTBs will mirror
this and so the vendor prefix should be added to the variable used to
locate these files.

Suggested-by: Ryan Eatmon <reatmon at ti.com>
Signed-off-by: Andrew Davis <afd at ti.com>
Signed-off-by: Manorit Chawdhry <m-chawdhry at ti.com>
---
 board/ti/am62ax/am62ax.env   | 2 +-
 board/ti/am62x/am62x.env     | 2 +-
 board/ti/am64x/am64x.env     | 4 ++--
 board/ti/am65x/am65x.env     | 2 +-
 board/ti/j721e/j721e.env     | 8 ++++----
 board/ti/j721s2/j721s2.env   | 6 +++---
 include/configs/am62ax_evm.h | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/board/ti/am62ax/am62ax.env b/board/ti/am62ax/am62ax.env
index 8c1c26e9a249..95401756e20a 100644
--- a/board/ti/am62ax/am62ax.env
+++ b/board/ti/am62ax/am62ax.env
@@ -1,7 +1,7 @@
 #include <environment/ti/ti_armv7_common.env>
 #include <environment/ti/mmc.env>
 
-default_device_tree=k3-am62a7-sk.dtb
+default_device_tree=ti/k3-am62a7-sk.dtb
 findfdt=
 	setenv name_fdt ${default_device_tree};
 	setenv fdtfile ${name_fdt}
diff --git a/board/ti/am62x/am62x.env b/board/ti/am62x/am62x.env
index 5ac15fd24010..37af69199167 100644
--- a/board/ti/am62x/am62x.env
+++ b/board/ti/am62x/am62x.env
@@ -1,7 +1,7 @@
 #include <environment/ti/ti_armv7_common.env>
 #include <environment/ti/mmc.env>
 
-default_device_tree=k3-am625-sk.dtb
+default_device_tree=ti/k3-am625-sk.dtb
 findfdt=
 	setenv name_fdt ${default_device_tree};
 	setenv fdtfile ${name_fdt}
diff --git a/board/ti/am64x/am64x.env b/board/ti/am64x/am64x.env
index 2a1a1fa53a36..4d27f16e8ca9 100644
--- a/board/ti/am64x/am64x.env
+++ b/board/ti/am64x/am64x.env
@@ -4,9 +4,9 @@
 
 findfdt=
 	if test $board_name = am64x_gpevm; then
-		setenv name_fdt k3-am642-evm.dtb; fi;
+		setenv name_fdt ti/k3-am642-evm.dtb; fi;
 	if test $board_name = am64x_skevm; then
-		setenv name_fdt k3-am642-sk.dtb; fi;
+		setenv name_fdt ti/k3-am642-sk.dtb; fi;
 	if test $name_fdt = undefined; then
 		echo WARNING: Could not determine device tree to use; fi;
 	setenv fdtfile ${name_fdt}
diff --git a/board/ti/am65x/am65x.env b/board/ti/am65x/am65x.env
index a048b47071f8..3c583b77fd1e 100644
--- a/board/ti/am65x/am65x.env
+++ b/board/ti/am65x/am65x.env
@@ -6,7 +6,7 @@
 #endif
 
 findfdt=
-	setenv name_fdt k3-am654-base-board.dtb;
+	setenv name_fdt ti/k3-am654-base-board.dtb;
 	setenv fdtfile ${name_fdt}
 name_kern=Image
 console=ttyS2,115200n8
diff --git a/board/ti/j721e/j721e.env b/board/ti/j721e/j721e.env
index c181741ca5b3..12b5610b3e47 100644
--- a/board/ti/j721e/j721e.env
+++ b/board/ti/j721e/j721e.env
@@ -7,15 +7,15 @@
 #include <environment/ti/k3_rproc.env>
 #endif
 
-default_device_tree=k3-j721e-common-proc-board.dtb
+default_device_tree=ti/k3-j721e-common-proc-board.dtb
 findfdt=
 	setenv name_fdt ${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 = j7200; then
-		setenv name_fdt k3-j7200-common-proc-board.dtb; fi;
+		setenv name_fdt ti/k3-j7200-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}
 name_kern=Image
 console=ttyS2,115200n8
diff --git a/board/ti/j721s2/j721s2.env b/board/ti/j721s2/j721s2.env
index f4467770e40c..67953d3f5984 100644
--- a/board/ti/j721s2/j721s2.env
+++ b/board/ti/j721s2/j721s2.env
@@ -7,13 +7,13 @@
 #include <environment/ti/k3_rproc.env>
 #endif
 
-default_device_tree=k3-j721s2-common-proc-board.dtb
+default_device_tree=ti/k3-j721s2-common-proc-board.dtb
 findfdt=
 	setenv name_fdt ${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}
 name_kern=Image
 console=ttyS2,115200n8
diff --git a/include/configs/am62ax_evm.h b/include/configs/am62ax_evm.h
index d8ef2509a895..98751f261753 100644
--- a/include/configs/am62ax_evm.h
+++ b/include/configs/am62ax_evm.h
@@ -21,7 +21,7 @@
 
 /* U-Boot general configuration */
 #define EXTRA_ENV_AM62A7_BOARD_SETTINGS					\
-	"default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0"	\
+	"default_device_tree=ti/k3-am62a7-sk.dtb\0"			\
 	"findfdt="							\
 		"setenv name_fdt ${default_device_tree};"		\
 		"setenv fdtfile ${name_fdt}\0"				\

-- 
2.40.1