configs: meson64_android: bypass other checks on run_fastboot=1

This can lead to GPT and BCB errors even if fastboot was selected early
by usb rom boot and the eMMC is blank/invalid.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
This commit is contained in:
Neil Armstrong 2021-11-17 12:04:10 +01:00
parent 886d36efdb
commit bdc68df4dd

View file

@ -140,25 +140,28 @@
"echo Fastboot forced by usb rom boot;" \ "echo Fastboot forced by usb rom boot;" \
"setenv run_fastboot 1;" \ "setenv run_fastboot 1;" \
"fi;" \ "fi;" \
"if test \"${run_fastboot}\" -eq 0; then " \
"if gpt verify mmc ${mmcdev} ${partitions}; then; " \ "if gpt verify mmc ${mmcdev} ${partitions}; then; " \
"else " \ "else " \
"echo Broken MMC partition scheme;" \ "echo Broken MMC partition scheme;" \
"setenv run_fastboot 1;" \ "setenv run_fastboot 1;" \
"fi; " \
"fi;" \ "fi;" \
"if test \"${run_fastboot}\" -eq 0; then " \
"if bcb load " __stringify(CONFIG_FASTBOOT_FLASH_MMC_DEV) " " \ "if bcb load " __stringify(CONFIG_FASTBOOT_FLASH_MMC_DEV) " " \
CONTROL_PARTITION "; then " \ CONTROL_PARTITION "; then " \
"if bcb test command = bootonce-bootloader; then " \ "if bcb test command = bootonce-bootloader; then " \
"echo BCB: Bootloader boot...; " \ "echo BCB: Bootloader boot...; " \
"bcb clear command; bcb store; " \ "bcb clear command; bcb store; " \
"setenv run_fastboot 1;" \ "setenv run_fastboot 1;" \
"fi; " \ "elif bcb test command = boot-fastboot; then " \
"if bcb test command = boot-fastboot; then " \
"echo BCB: fastboot userspace boot...; " \ "echo BCB: fastboot userspace boot...; " \
"setenv force_recovery 1;" \ "setenv force_recovery 1;" \
"fi; " \ "fi; " \
"else " \ "else " \
"echo Warning: BCB is corrupted or does not exist; " \ "echo Warning: BCB is corrupted or does not exist; " \
"fi;" \ "fi;" \
"fi;" \
"if test \"${run_fastboot}\" -eq 1; then " \ "if test \"${run_fastboot}\" -eq 1; then " \
"echo Running Fastboot...;" \ "echo Running Fastboot...;" \
"fastboot " __stringify(CONFIG_FASTBOOT_USB_DEV) "; " \ "fastboot " __stringify(CONFIG_FASTBOOT_USB_DEV) "; " \