From: Manorit Chawdhry Date: Tue, 2 Jul 2024 05:20:03 +0000 (+0530) Subject: include: env: ti: mmc: Change name_fdt usage to fdtfile X-Git-Url: http://git.dujemihanovic.xyz/posts?a=commitdiff_plain;h=bc2d846af7adece28d31d7a72d06d9b94369ab08;p=u-boot.git include: env: ti: mmc: Change name_fdt usage to fdtfile name_fdt is kept for backward compatibility but it depends on EEPROM detection logic and some of the TI K3 platforms don't have that anymore which causes boot failure in legacy boot flow using bootcmd_ti_mmc. K2g platforms which uses the same file have their own override causing this change to be no-impact for them. Replacing name_fdt usage to fdtfile as fdtfile is populated based on CONFIG_DEFAULT_DEVICE_TREE after using ti_set_fdt_env. Signed-off-by: Manorit Chawdhry --- diff --git a/include/env/ti/mmc.env b/include/env/ti/mmc.env index 0256a2d2aa..037a09010c 100644 --- a/include/env/ti/mmc.env +++ b/include/env/ti/mmc.env @@ -16,7 +16,7 @@ importbootenv=echo Importing environment from mmc${mmcdev} ...; loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenvfile} loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile} loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/dtb/${fdtfile} -get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/dtb/${name_fdt} +get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/dtb/${fdtfile} envboot=if mmc dev ${mmcdev}; then if mmc rescan; then echo SD/MMC found on device ${mmcdev};