From ee77bb571925069e5f179d6d0c27b2411f2d77f0 Mon Sep 17 00:00:00 2001
From: Ian Ray <ian.ray@ge.com>
Date: Fri, 23 Apr 2021 16:15:12 +0200
Subject: [PATCH] include: configs: ge: simplify default boot command

Minor cosmetic changes to unify `CONFIG_EXTRA_ENV_SETTINGS'
indentation between Bx50v3 and PPD to make comparison and
review easier and simplify the default boot command.

Signed-off-by: Ian Ray Ian Ray <ian.ray@ge.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 include/configs/ge_bx50v3.h |  9 +++------
 include/configs/mx53ppd.h   | 15 +++++++--------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index f1e0ec553c..a4d5752bf4 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -92,7 +92,6 @@
 	"swappartitions=" \
 		"setexpr partnum 3 - ${partnum}\0" \
 	"failbootcmd=" \
-		"echo reached failbootcmd; " \
 		"cls; " \
 		"setcurs 5 4; " \
 		"lcdputs \"Monitor failed to start. " \
@@ -115,15 +114,13 @@
 	"tryboot=" \
 		"setenv partnum 1; run hasfirstboot || setenv partnum 2; " \
 		"run loadimage || run swappartitions && run loadimage || " \
-		"setenv partnum 0 && echo MISSING IMAGE;" \
+			"setenv partnum 0 && echo MISSING IMAGE;" \
 		"run doboot; " \
 		"run failbootcmd\0" \
 
 #define CONFIG_MMCBOOTCOMMAND \
-	"if mmc dev ${devnum}; then " \
-		"run doquiet; " \
-		"run tryboot; " \
-	"fi; " \
+	"run doquiet; " \
+	"run tryboot; " \
 
 #ifdef CONFIG_CMD_NFS
 #define CONFIG_BOOTCOMMAND CONFIG_NETWORKBOOTCOMMAND
diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index d3133293c6..a8c5c828bd 100644
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -64,11 +64,13 @@
 		"vt.global_cursor_default=0 bootcause=${bootcause} ${quiet}\0" \
 	"bootargs_emmc=setenv bootargs root=/dev/${rootdev}${partnum} ro " \
 		"rootwait ${bootargs}\0" \
-	"doquiet=if ext2load ${dev} ${devnum}:5 0x7000A000 /boot/console; " \
-		"then setenv quiet; fi\0" \
+	"doquiet=" \
+		"if ext2load ${dev} ${devnum}:5 0x7000A000 /boot/console; " \
+			"then setenv quiet; fi\0" \
 	"hasfirstboot=" \
 		"test -e ${dev} ${devnum}:${partnum} /boot/bootcause/firstboot\0" \
-	"swappartitions=setexpr partnum 3 - ${partnum}\0" \
+	"swappartitions=" \
+		"setexpr partnum 3 - ${partnum}\0" \
 	"failbootcmd=" \
 		"cls; " \
 		"setcurs 5 4; " \
@@ -80,7 +82,6 @@
 		"setenv partnum 1; run hasfirstboot || setenv partnum 2; " \
 		"run hasfirstboot || setenv partnum 0; " \
 		"if test ${partnum} != 0; then " \
-			"setenv bootcause REVERT; " \
 			"run swappartitions loadimage doboot; " \
 		"fi; " \
 		"run failbootcmd\0" \
@@ -101,10 +102,8 @@
 		"lcd:800x480-24@60,monitor=lcd\0" \
 
 #define CONFIG_MMCBOOTCOMMAND \
-	"if mmc dev ${devnum}; then " \
-		"run doquiet; " \
-		"run tryboot; " \
-	"fi; " \
+	"run doquiet; " \
+	"run tryboot; " \
 
 #define CONFIG_BOOTCOMMAND CONFIG_MMCBOOTCOMMAND
 
-- 
2.39.5