From 014e013e784fdc03b254508d3785fd46088bd346 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Fri, 14 Jul 2023 11:22:31 +0530 Subject: 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 Signed-off-by: Manorit Chawdhry --- include/environment/ti/mmc.env | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include/environment') 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 -- cgit v1.3.1 From 4ae1a2470ce7895b747c85a140aaf8b647ae6a32 Mon Sep 17 00:00:00 2001 From: Manorit Chawdhry Date: Fri, 14 Jul 2023 11:22:34 +0530 Subject: env: Make common bootcmd across all k3 devices This is helpful to go forward with distro_bootcmd as default boot. Signed-off-by: Manorit Chawdhry --- include/environment/ti/ti_armv7_common.env | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'include/environment') diff --git a/include/environment/ti/ti_armv7_common.env b/include/environment/ti/ti_armv7_common.env index 0c0929d8628..e87a41a6590 100644 --- a/include/environment/ti/ti_armv7_common.env +++ b/include/environment/ti/ti_armv7_common.env @@ -22,4 +22,13 @@ get_overlaystring= done; get_fit_config=setexpr name_fit_config gsub / _ conf-${fdtfile} run_fit=run get_fit_config; bootm ${addr_fit}#${name_fit_config}${overlaystring} - +bootcmd_ti_mmc= + run findfdt; run init_${boot}; +#if CONFIG_CMD_REMOTEPROC + run main_cpsw0_qsgmii_phyinit; run boot_rprocs; +#endif + if test ${boot_fit} -eq 1; + then run get_fit_${boot}; run get_overlaystring; run run_fit; + else; + run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern; + fi; -- cgit v1.3.1