commit 014b4bd63360b7e20ec03e47d0f404f86894ae83
author Yecheng Zhao <zyecheng@google.com> Thu Jan 04 13:06:45 2024 -0800
committer Yecheng Zhao <zyecheng@google.com> Thu Jan 04 14:02:46 2024 -0800
tree bba3fd6a1a74b0f8ac08e98a45e914b8f1ed0cbe
parent 08198203ef14913e65cbe0863c5b5b6ed677cd19

[fastboot] Log reasons for dropping to fastboot

Change-Id: I09c212dd262614bb7df94d7d0467c722ba9bc16a
Reviewed-on: https://turquoise-internal-review.googlesource.com/c/third_party/u-boot/+/795744
Reviewed-by: Drew Fisher <zarvox@google.com>
Reviewed-by: Vinicius Felizardo <felizardo@google.com>
GitOrigin-RevId: d70e43ca70d65424ac5b87bd930647d5f67f1454

board/khadas/configs/kvim3.h

diff --git a/board/khadas/configs/kvim3.h b/board/khadas/configs/kvim3.h
index 7026e79..8cd5c92 100644
--- a/board/khadas/configs/kvim3.h
+++ b/board/khadas/configs/kvim3.h
@@ -169,6 +169,7 @@
         "upgrade_check="\
             "echo upgrade_step=${upgrade_step}; "\
             "if itest ${upgrade_step} == 3; then "\
+                "echo upgrade_step ${upgrade_step}. Entering fastboot;"\
                 "run init_display; run storeargs; run update;"\
             "else fi;"\
             "\0"\
@@ -185,6 +186,7 @@
                     "run recovery_from_flash;"\
             "else if test ${reboot_mode} = update; then "\
                     "setenv reboot_mode_android ""normal"";"\
+                    "echo reboot_mode is update. Entering fastboot;"\
                     "run storeargs;"\
                     "run update;"\
             "else if test ${reboot_mode} = quiescent; then "\
@@ -202,6 +204,7 @@
             "else if test ${reboot_mode} = fastboot; then "\
                 "setenv reboot_mode_android ""normal"";"\
                 "run storeargs;"\
+                "echo reboot_mode is fastboot. Entering fastboot;"\
                 "fastboot;"\
             "fi;fi;fi;fi;fi;fi;"\
             "\0" \
@@ -209,7 +212,7 @@
             "boot_cooling;"\
             "run storeargs;"\
             "zbi_boot ${loadaddr} ${loadsize} kernel;"\
-            "echo failed to boot kernel;"\
+            "echo failed to boot kernel. Falling back to fastboot;"\
             "fastboot;"\
             "\0"\
         "factory_reset_poweroff_protect="\
@@ -255,7 +258,7 @@
             "\0"\
         "recovery_from_flash="\
             "zbi_boot ${loadaddr} ${loadsize} recovery;"\
-            "echo failed to boot recovery;"\
+            "echo failed to boot recovery. Falling back to fastboot;"\
             "run storeargs; fastboot;"\
             "\0"\
         "init_display="\
@@ -358,7 +361,7 @@
             "\0"\
         "upgrade_key="\
             "if gpio input GPIOAO_7; then "\
-                "echo detect upgrade key;"\
+                "echo detect upgrade key. Enetering fastboot;"\
                 "run storeargs;"\
                 "run update;"\
             "fi;"\
@@ -373,8 +376,10 @@
 		"if irkey 2500000 0xe31cfb04 0xb748fb04; then "\
 			"echo read irkey ok!; " \
 		"if itest ${irkey_value} == 0xe31cfb04; then " \
+            "echo irkey value ${irkey_value}. Enetering fastboot;"\
 			"run update;" \
 		"else if itest ${irkey_value} == 0xb748fb04; then " \
+            "echo irkey value ${irkey_value}. Enetering fastboot;"\
 			"run update;\n" \
 			"fi;fi;" \
 		"fi;\0" \

common/autoboot.c

diff --git a/common/autoboot.c b/common/autoboot.c
index ec68ab9..746ac99 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -25,7 +25,7 @@
 #define MAX_DELAY_STOP_STR 32
 
 #ifndef DEBUG_BOOTKEYS
-#define DEBUG_BOOTKEYS 0
+#define DEBUG_BOOTKEYS 1
 #endif
 #define debug_bootkeys(fmt, args...)		\
 	debug_cond(DEBUG_BOOTKEYS, fmt, ##args)

common/main.c

diff --git a/common/main.c b/common/main.c
index ba00e4d..6b08f68 100644
--- a/common/main.c
+++ b/common/main.c
@@ -128,6 +128,7 @@
 
 	autoboot_command(s);
 
+	printf("Autoboot abort. Entering fastboot...\n");
 	run_command("run storeargs", 0);
 	run_command("fastboot", 0);