Browse Source

MLK-13410 Android: Change to set mfgtool only for none android u-boot

The mfgtool environments only can set in BSP u-boot image, not for android
u-boot. Since android u-boot may go into fastboot in board_r phase which is
earlier than mfgtool environment check. The USB status from android fastboot
will cause u-boot to configure mfgtool environment.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 066f001a19)
(cherry picked from commit 03f995630f)
imx_v2016.03_4.1.15_2.0.0_ga
Ye Li 4 years ago
committed by Robby Cai
parent
commit
756f99a428
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      common/autoboot.c

+ 2
- 2
common/autoboot.c View File

@ -326,7 +326,7 @@ const char *bootdelay_process(void)
s = getenv("bootdelay");
bootdelay = s ? (int)simple_strtol(s, NULL, 10) : CONFIG_BOOTDELAY;
#ifdef is_boot_from_usb
#if !defined(CONFIG_FSL_FASTBOOT) && defined(is_boot_from_usb)
if (is_boot_from_usb()) {
disconnect_from_pc();
printf("Boot from USB for mfgtools\n");
@ -364,7 +364,7 @@ const char *bootdelay_process(void)
#endif /* CONFIG_BOOTCOUNT_LIMIT */
s = getenv("bootcmd");
#ifdef is_boot_from_usb
#if !defined(CONFIG_FSL_FASTBOOT) && defined(is_boot_from_usb)
if (is_boot_from_usb()) {
s = getenv("bootcmd_mfg");
printf("Run bootcmd_mfg: %s\n", s);


Loading…
Cancel
Save