]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
configs: transformer_t30: convert bootmenu option
authorSvyatoslav Ryhel <clamor95@gmail.com>
Tue, 3 Oct 2023 06:36:37 +0000 (09:36 +0300)
committerTom Rini <trini@konsulko.com>
Fri, 3 Nov 2023 16:37:15 +0000 (12:37 -0400)
Convert refresh USB to enter console. Transformers have full size
USB and a dock keyboard so access to U-Boot console would be handy.

Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>
configs/transformer_t30_defconfig
include/configs/transformer-common.h

index 8fbf23146edc721daf4c0398fcf8e36a1e1bd79a..092c0aa2b01f747c01409f25319a0ab9282a8a78 100644 (file)
@@ -20,7 +20,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_KEYED_CTRLC=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_BOOTCOMMAND="setenv gpio_button 150; if run check_button; then poweroff; fi; setenv gpio_button 131; if run check_button; then bootmenu; fi; run bootcmd_usb0; run bootcmd_mmc1; run bootcmd_mmc0; poweroff;"
+CONFIG_BOOTCOMMAND="setenv skip_boot 0; setenv gpio_button 150; if run check_button; then poweroff; fi; setenv gpio_button 131; if run check_button; then bootmenu; fi; if test ${skip_boot} -eq 1; then; else run bootcmd_usb0; run bootcmd_mmc1; run bootcmd_mmc0; poweroff; fi"
 CONFIG_SPL_FOOTPRINT_LIMIT=y
 CONFIG_SPL_MAX_FOOTPRINT=0x8000
 # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
index dcdda1ec5b49bb5cf208f22e9684fdcb2dbcac62..3b7db0ab142fdd2d214f9d9b59deb9e84a951967 100644 (file)
                "else echo SPI flash backup FAILED! Aborting ...;" \
                        "poweroff; fi\0"
 
-#define TRANSFORMER_REFRESH_USB \
-       "refresh_usb=usb start; usb reset; usb tree; usb info;" \
-               "pause 'Press ANY key to return to bootmenu...'; bootmenu\0"
-
 #define TRANSFORMER_BOOTMENU \
        TRANSFORMER_FLASH_UBOOT \
        TRANSFORMER_FLASH_SPI \
-       TRANSFORMER_REFRESH_USB \
        "bootmenu_0=mount internal storage=usb start && ums 0 mmc 0; bootmenu\0" \
        "bootmenu_1=mount external storage=usb start && ums 0 mmc 1; bootmenu\0" \
        "bootmenu_2=fastboot=echo Starting Fastboot protocol ...; fastboot usb 0; bootmenu\0" \
        "bootmenu_3=update bootloader=run flash_uboot\0" \
-       "bootmenu_4=refresh USB=run refresh_usb\0" \
+       "bootmenu_4=enter console=usb start; setenv skip_boot 1; exit\0" \
        "bootmenu_5=reboot RCM=enterrcm\0" \
        "bootmenu_6=reboot=reset\0" \
        "bootmenu_7=power off=poweroff\0" \