Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 3f96c0ddf6ba76d0bb1cb7240fed2a3851530e05

Authored by faqiang.zhu
Committed by Ji Luo
1 parent 5f9e35bae7
Exists in smarc_8mq-imx_v2020.04_5.4.24_2.1.0 and in 1 other branch smarc_8mm-imx_v2020.04_5.4.24_2.1.0

MA-14916-10 fix fastboot reboot bootloader issue 

In Android, the reboot bootloader flag is written to misc partition, in
the boot flow, u-boot will check that message to decide whether enter
fastboot mode or not. To be compatible with the common implemention,
keep the fastboot_set_reboot_flag there and redefine it to avoid the
error return value which block the reboot process.

Change-Id: Ifb55236d5a5daf3edd124d3ed01851ff6e916e1a
Signed-off-by: faqiang.zhu <faqiang.zhu@nxp.com>
(cherry picked from commit aa78cbe3d3148ab99ea039ede767e6d1152092b4)

Showing 1 changed file with 13 additions and 0 deletions Side-by-side Diff

drivers/fastboot/fb_fsl/fb_fsl_command.c
Diff comments   View file @ 3f96c0d
... ... @@ -722,6 +722,19 @@
722 722 }
723 723 #endif
724 724  
  725 +/**
  726 + * fastboot_set_reboot_flag() - Set flag to indicate reboot-bootloader
  727 + *
  728 + * This is a redefinition, since BSP dose not need the function of
  729 + * "reboot into bootloader", and with BCB support, the flag can be
  730 + * set with another way. Redefine this function to override the weak
  731 + * definition to avoid error return value.
  732 + */
  733 +int fastboot_set_reboot_flag(void)
  734 +{
  735 + return 0;
  736 +}
  737 +
725 738 #if CONFIG_IS_ENABLED(FASTBOOT_UUU_SUPPORT)
726 739 /**
727 740 * run_ucmd() - Execute the UCmd command