Skip to contentSkip to conversation

env: ti: Improve "fastboot reboot bootloader" handling

PATCH New Sam Protsenko 1 participant 2 messages Jun 20, 2019 – Jul 4, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 env: ti: Improve "fastboot reboot bootloader" handling

Enter fastboot mode ASAP during the boot, when user performed "fastboot reboot bootloader" command, before starting the CONFIG_BOOTDELAY countdown. We don't want to allow user to get into U-Boot shell when we already know user wants to get into fastboot mode.

---
 include/environment/ti/boot.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
include/environment/ti/boot.h +3 -1
index a6b245b1c7..8ddb0416c4 100644
@@ -126,13 +126,15 @@
 		"if test $fdtfile = undefined; then " \
 			"echo WARNING: Could not determine device tree to use; fi; \0"
 
-#define CONFIG_BOOTCOMMAND \
+#define CONFIG_PREBOOT \
 	"if test ${dofastboot} -eq 1; then " \
 		"echo Boot fastboot requested, resetting dofastboot ...;" \
 		"setenv dofastboot 0; saveenv;" \
 		"echo Booting into fastboot ...; " \
 		"fastboot " __stringify(CONFIG_FASTBOOT_USB_DEV) "; " \
 	"fi;" \
+
+#define CONFIG_BOOTCOMMAND \
 	"if test ${boot_fit} -eq 1; then "	\
 		"run update_to_fit;"	\
 	"fi;"	\
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 env: ti: Improve "fastboot reboot bootloader" handling

Please ignore this one.

I came to the conclusion that it's an abuse of "preboot" feature, as user can change it anytime. Anyway, seems like booting into fastboot should be the part of Android boot procedure, which is done before "bootm" command execution.

Quoted 35 lines · Sam Protsenko

Enter fastboot mode ASAP during the boot, when user performed "fastboot reboot bootloader" command, before starting the CONFIG_BOOTDELAY countdown. We don't want to allow user to get into U-Boot shell when we already know user wants to get into fastboot mode.

---
 include/environment/ti/boot.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
include/environment/ti/boot.h +3 -2
index a6b245b1c7..8ddb0416c4 100644
@@ -126,13 +126,15 @@
                "if test $fdtfile = undefined; then " \
                        "echo WARNING: Could not determine device tree to use; fi; \0"
 
-#define CONFIG_BOOTCOMMAND \
+#define CONFIG_PREBOOT \
        "if test ${dofastboot} -eq 1; then " \
                "echo Boot fastboot requested, resetting dofastboot ...;" \
                "setenv dofastboot 0; saveenv;" \
                "echo Booting into fastboot ...; " \
                "fastboot " __stringify(CONFIG_FASTBOOT_USB_DEV) "; " \
        "fi;" \
+
+#define CONFIG_BOOTCOMMAND \
        "if test ${boot_fit} -eq 1; then "      \
                "run update_to_fit;"    \
        "fi;"   \
--

2.20.1