]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Nokia RX-51: Do not try calling both ext2load and ext4load
authorPali Rohár <pali@kernel.org>
Mon, 30 Nov 2020 19:10:34 +0000 (20:10 +0100)
committerLokesh Vutla <lokeshvutla@ti.com>
Tue, 12 Jan 2021 05:29:04 +0000 (10:59 +0530)
Those two commands now doing same thing, reading from ext2/3/4 filesystem.
So remove useless duplicated call.

Signed-off-by: Pali Rohár <pali@kernel.org>
Acked-by: Pavel Machek <pavel@ucw.cz>
include/configs/nokia_rx51.h

index 6879f52a0c908d1736b242895358947f87c6525a..3f2700d8e22d6c0571b76d2dd5fe5ec06bd44c07 100644 (file)
@@ -169,8 +169,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
        "trymmcboot=if run switchmmc; then " \
                        "setenv mmctype fat;" \
                        "run trymmcallpartboot;" \
-                       "setenv mmctype ext2;" \
-                       "run trymmcallpartboot;" \
                        "setenv mmctype ext4;" \
                        "run trymmcallpartboot;" \
                "fi\0" \
@@ -179,19 +177,10 @@ int rx51_kp_getc(struct stdio_dev *sdev);
        "preboot=setenv mmcnum 1; setenv mmcpart 1;" \
                "setenv mmcscriptfile bootmenu.scr;" \
                "if run switchmmc; then " \
-                       "setenv mmcdone true;" \
                        "setenv mmctype fat;" \
-                       "if run scriptload; then true; else " \
-                               "setenv mmctype ext2;" \
-                               "if run scriptload; then true; else " \
-                                       "setenv mmctype ext4;" \
-                                       "if run scriptload; then true; else " \
-                                               "setenv mmcdone false;" \
-                                       "fi;" \
-                               "fi;" \
-                       "fi;" \
-                       "if ${mmcdone}; then " \
-                               "run scriptboot;" \
+                       "if run scriptload; then run scriptboot; else " \
+                               "setenv mmctype ext4;" \
+                               "if run scriptload; then run scriptboot; fi;" \
                        "fi;" \
                "fi;" \
                "if run slide; then true; else " \