Skip to contentSkip to conversation

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

PATCH New Pali Rohár 3 participants 3 messages Nov 30, 2020 – Jan 5, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 include/configs/nokia_rx51.h | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)
include/configs/nokia_rx51.h +3 -14
index 6879f52a0c..3f2700d8e2 100644
@@ -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 " \
Signature · 1 line
2.20.1
#1 lore raw

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

Quoted 4 lines · Pali Roh?r

Those two commands now doing same thing, reading from ext2/3/4 filesystem. So remove useless duplicated call.

Signature · 8 lines
http://www.livejournal.com/~pavelmachek
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201230/53a6bfa1/attachment.sig>
#2 lore raw

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

In reply to Pali Rohár
Quoted 4 lines · Pali Roh?r

Those two commands now doing same thing, reading from ext2/3/4 filesystem. So remove useless duplicated call.

Applied to u-boot-ti/for-next branch

Thanks and regards,
Lokesh

Quoted 41 lines
---
 include/configs/nokia_rx51.h | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)
include/configs/nokia_rx51.h +3 -14
index 6879f52a0c..3f2700d8e2 100644
@@ -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 " \