include: env: ti: move board specific scripts out of ti_common

bootcmd_ti_mmc had cpsw0_qsgmii_phyinit related scripts even though this
was only relevant for the j721e/j7200 SoCs. This patch instead factors
out those scripts into a generic 'board_init' which is called as part of
bootcmd_ti_mmc.

This allows boards to more easily add custom behaviour to the ti_mmc
bootflow instead of having to modify the ti_common.env file.

Signed-off-by: Anshul Dalal <anshuld@ti.com>

diff --git a/board/ti/j7200/j7200.env b/board/ti/j7200/j7200.env
index e22a954d8db7c25a5b70d4dc270e325bda472cb5..7bb63825c5275457186d0171816f845157dbb13c 100644 (file)
--- a/board/ti/j7200/j7200.env
+++ b/board/ti/j7200/j7200.env
@@ -37,3 +37,11 @@ main_cpsw0_qsgmii_phyinit=
 #if CONFIG_TARGET_J7200_A72_EVM
 rproc_fw_binaries= 1 /lib/firmware/j7200-mcu-r5f0_1-fw 2 /lib/firmware/j7200-main-r5f0_0-fw 3 /lib/firmware/j7200-main-r5f0_1-fw
 #endif
+
+#if CONFIG_CMD_REMOTEPROC
+board_init=
+       if env exists do_main_cpsw0_qsgmii_phyinit;
+               then run main_cpsw0_qsgmii_phyinit;
+       fi;
+       run boot_rprocs;
+#endif

diff --git a/board/ti/j721e/j721e.env b/board/ti/j721e/j721e.env
index 34f5f63d60abd91934100328013b16eff0dea434..9ecf7bfabde75bebde1103f56bab278d1e2d01c0 100644 (file)
--- a/board/ti/j721e/j721e.env
+++ b/board/ti/j721e/j721e.env
@@ -37,3 +37,11 @@ main_cpsw0_qsgmii_phyinit=
 #if CONFIG_TARGET_J721E_A72_EVM
 rproc_fw_binaries= 1 /lib/firmware/j7-mcu-r5f0_1-fw 2 /lib/firmware/j7-main-r5f0_0-fw 3 /lib/firmware/j7-main-r5f0_1-fw 4 /lib/firmware/j7-main-r5f1_0-fw 5 /lib/firmware/j7-main-r5f1_1-fw 6 /lib/firmware/j7-c66_0-fw 7 /lib/firmware/j7-c66_1-fw 8 /lib/firmware/j7-c71_0-fw
 #endif
+
+#if CONFIG_CMD_REMOTEPROC
+board_init=
+       if env exists do_main_cpsw0_qsgmii_phyinit;
+               then run main_cpsw0_qsgmii_phyinit;
+       fi;
+       run boot_rprocs;
+#endif

diff --git a/include/env/ti/ti_common.env b/include/env/ti/ti_common.env
index a0ed83f52acde35e87fa3333cfe81c5641c13603..62b93eb25c4541d0887e095c77d4e06bbfc6bd37 100644 (file)
--- a/include/env/ti/ti_common.env
+++ b/include/env/ti/ti_common.env
@@ -24,12 +24,10 @@ 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 init_${boot};
-#if CONFIG_CMD_REMOTEPROC
-       if env exists do_main_cpsw0_qsgmii_phyinit;
-               then run main_cpsw0_qsgmii_phyinit;
+       if test -n ${board_init}; then
+               echo Running board_init ...;
+               run board_init;
        fi;
-       run boot_rprocs;
-#endif
        if test ${boot_fit} -eq 1;
                then run get_fit_${boot}; run get_fit_overlaystring; run run_fit;
        else;