include: env: ti: mmc: envboot: Only attempt boot.scr if BOOTSTD is not enabled

'script' bootmethod that should be used with CONFIG_BOOTSTD.

Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

diff --git a/include/env/ti/mmc.env b/include/env/ti/mmc.env
index b8eb51ca17441381af431f97cbd2b49afcffd58e..0256a2d2aacaf13c6461e0b617d105dba413dbd2 100644 (file)
--- a/include/env/ti/mmc.env
+++ b/include/env/ti/mmc.env
@@ -5,7 +5,9 @@ args_mmc=run finduuid;setenv bootargs console=${console}
        ${optargs}
        root=PARTUUID=${uuid} rw
        rootfstype=${mmcrootfstype}
+#ifndef CONFIG_BOOTSTD
 loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr
+#endif
 bootscript=echo Running bootscript from mmc${mmcdev} ...;
        source ${loadaddr}
 bootenvfile=uEnv.txt
@@ -18,7 +20,7 @@ get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/dtb/${name_fdt}
 envboot=if mmc dev ${mmcdev}; then
        if mmc rescan; then
                echo SD/MMC found on device ${mmcdev};
-               if run loadbootscript; then
+               if test -n "${loadbootscript}" && run loadbootscript; then
                        run bootscript;
                else
                        if run loadbootenv; then