environment: ti: Prefix ARM64 DTB names with directory

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@ti.com>
Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
Reviewed-by: Nikhil M Jain <n-jain1@ti.com>

diff --git a/board/ti/am62ax/am62ax.env b/board/ti/am62ax/am62ax.env
index 8c1c26e..9540175 100644 (file)
--- 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 5ac15fd..37af691 100644 (file)
--- 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 2a1a1fa..4d27f16 100644 (file)
--- 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 a048b47..3c583b7 100644 (file)
--- 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 c181741..12b5610 100644 (file)
--- 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 f446777..67953d3 100644 (file)
--- 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 d8ef250..98751f2 100644 (file)
--- 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"                          \