ARM: am335x: env: Fix mmcboot settings

Remove an extra fi command in mmcboot which is not used.
Also add envboot to mmcboot so that uEnv.txt can be loaded from
both SD and emmc.

Reported-by: Craig McQueen <craig.mcqueen@innerrange.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index ec0494965f8dedfc32671fa4cdd7043bf0bf25cc..8dccefa269eee3c5b6cb4574a3845b6c6a51d8a8 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -116,10 +116,10 @@
        "mmcboot=mmc dev ${mmcdev}; " \
                "if mmc rescan; then " \
                        "echo SD/MMC found on device ${mmcdev};" \
-                               "if run loadimage; then " \
-                                       "run mmcloados;" \
-                               "fi;" \
-                       "fi ;" \
+                       "run envboot; " \
+                       "if run loadimage; then " \
+                               "run mmcloados;" \
+                       "fi;" \
                "fi;\0" \
        "spiboot=echo Booting from spi ...; " \
                "run spiargs; " \
@@ -147,7 +147,6 @@
 
 #define CONFIG_BOOTCOMMAND \
        "run findfdt; " \
-       "run envboot; " \
        "run mmcboot;" \
        "setenv mmcdev 1; " \
        "setenv bootpart 1:2; " \