diff options
| author | Nishanth Menon | 2023-08-25 13:02:47 -0500 |
|---|---|---|
| committer | Tom Rini | 2023-09-08 10:07:11 -0400 |
| commit | 88419bb2d6c232020cfdd01091531c4602d1d412 (patch) | |
| tree | 0efd961f13728d8508de9c9a441b876933516b74 | |
| parent | 6e869e104a489cb399042233cdce325d9773eacc (diff) | |
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>
| -rw-r--r-- | include/env/ti/mmc.env | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/env/ti/mmc.env b/include/env/ti/mmc.env index b8eb51ca174..0256a2d2aac 100644 --- 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 |