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>
This commit is contained in:
Andrew Davis 2023-07-14 11:22:30 +05:30 committed by Tom Rini
parent a5e8678e0a
commit d8ea68da6b
7 changed files with 13 additions and 13 deletions

View file

@ -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}

View file

@ -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}

View file

@ -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}

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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" \