environment: ti: Make get_fdt_mmc common

Since get_fdt_mmc is common, factor it out into mmc.env and remove
it from each platform env file along with changing the directory path to
reflect the standards. Use it in mmcloados but keep loadfdt
defined in case it is still used by some external uEnv.txt script.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>

7 files changed, 3 insertions, 8 deletions

diff --git a/board/ti/am62ax/am62ax.env b/board/ti/am62ax/am62ax.env
index 95401756e20..491ec973bbc 100644
--- a/board/ti/am62ax/am62ax.env
+++ b/board/ti/am62ax/am62ax.env
@@ -17,7 +17,6 @@ bootpart=1:2
 bootdir=/boot
 rd_spec=-
 init_mmc=run args_all args_mmc
-get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}
 get_overlay_mmc=
 	fdt address ${fdtaddr};
 	fdt resize 0x100000;
diff --git a/board/ti/am62x/am62x.env b/board/ti/am62x/am62x.env
index 37af6919916..0901a8536da 100644
--- a/board/ti/am62x/am62x.env
+++ b/board/ti/am62x/am62x.env
@@ -17,7 +17,6 @@ bootpart=1:2
 bootdir=/boot
 rd_spec=-
 init_mmc=run args_all args_mmc
-get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}
 get_overlay_mmc=
 	fdt address ${fdtaddr};
 	fdt resize 0x100000;
diff --git a/board/ti/am64x/am64x.env b/board/ti/am64x/am64x.env
index 4d27f16e8ca..015f63a66c7 100644
--- a/board/ti/am64x/am64x.env
+++ b/board/ti/am64x/am64x.env
@@ -21,7 +21,6 @@ bootpart=1:2
 bootdir=/boot
 rd_spec=-
 init_mmc=run args_all args_mmc
-get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}
 get_overlay_mmc=
 	fdt address ${fdtaddr};
 	fdt resize 0x100000;
diff --git a/board/ti/am65x/am65x.env b/board/ti/am65x/am65x.env
index 3c583b77fd1..d7130cc3f7d 100644
--- a/board/ti/am65x/am65x.env
+++ b/board/ti/am65x/am65x.env
@@ -20,7 +20,6 @@ bootpart=1:2
 bootdir=/boot
 rd_spec=-
 init_mmc=run args_all args_mmc
-get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}
 get_overlay_mmc=
 	fdt address ${fdtaddr};
 	fdt resize 0x100000;
diff --git a/board/ti/j721e/j721e.env b/board/ti/j721e/j721e.env
index 12b5610b3e4..23ce7e1af74 100644
--- a/board/ti/j721e/j721e.env
+++ b/board/ti/j721e/j721e.env
@@ -37,7 +37,6 @@ bootpart=1:2
 bootdir=/boot
 rd_spec=-
 init_mmc=run args_all args_mmc
-get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}
 get_overlay_mmc=
 	fdt address ${fdtaddr};
 	fdt resize 0x100000;
diff --git a/board/ti/j721s2/j721s2.env b/board/ti/j721s2/j721s2.env
index 67953d3f598..9464fe49903 100644
--- a/board/ti/j721s2/j721s2.env
+++ b/board/ti/j721s2/j721s2.env
@@ -31,7 +31,6 @@ name_mcur5f0_0fw=/lib/firmware/j7-mcu-r5f0_0-fw
 #endif
 rd_spec=-
 init_mmc=run args_all args_mmc
-get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}
 get_overlay_mmc=
 	fdt address ${fdtaddr};
 	fdt resize 0x100000;
diff --git a/include/environment/ti/mmc.env b/include/environment/ti/mmc.env
index 5677d057d86..a052d288535 100644
--- a/include/environment/ti/mmc.env
+++ b/include/environment/ti/mmc.env
@@ -13,7 +13,8 @@ importbootenv=echo Importing environment from mmc${mmcdev} ...;
 	env import -t ${loadaddr} ${filesize}
 loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenvfile}
 loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}
-loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}
+loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/dtb/${fdtfile}
+get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/dtb/${name_fdt}
 envboot=mmc dev ${mmcdev};
 	if mmc rescan; then
 		echo SD/MMC found on device ${mmcdev};
@@ -32,7 +33,7 @@ envboot=mmc dev ${mmcdev};
 	fi;
 mmcloados=
 	if test ${boot_fdt} = yes || test ${boot_fdt} = try; then
-		if run loadfdt; then
+		if run get_fdt_mmc; then
 			bootz ${loadaddr} - ${fdtaddr};
 		else
 			if test ${boot_fdt} = try; then