From: Pali Rohár <pali@kernel.org>
Date: Mon, 30 Nov 2020 19:10:34 +0000 (+0100)
Subject: Nokia RX-51: Do not try calling both ext2load and ext4load
X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=25c5b6517854ffc80d4cc3a86d0e69942abb8e2c;p=u-boot.git

Nokia RX-51: Do not try calling both ext2load and ext4load

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>
---

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 6879f52a0c..3f2700d8e2 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -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 " \