Merge "fastboot: add EDL mode support" am: 894f3ea7cb am: 87ebc42750 am: 3d60ec646e

am: 6e0a4c28c2

Change-Id: Icdfbe0967573b17b8d9e636cd155646b381eb8f1
This commit is contained in:
Alexey Polyudov 2017-01-25 07:18:53 +00:00 committed by android-build-merger
commit fc2677b5da
1 changed files with 10 additions and 1 deletions

View File

@ -358,7 +358,7 @@ static void usage() {
" devices [-l] List all connected devices [with\n"
" device paths].\n"
" continue Continue with autoboot.\n"
" reboot [bootloader] Reboot device [into bootloader].\n"
" reboot [bootloader|emergency] Reboot device [into bootloader or emergency mode].\n"
" reboot-bootloader Reboot device into bootloader.\n"
" help Show this help message.\n"
"\n"
@ -1397,6 +1397,7 @@ int main(int argc, char **argv)
bool wants_wipe = false;
bool wants_reboot = false;
bool wants_reboot_bootloader = false;
bool wants_reboot_emergency = false;
bool skip_reboot = false;
bool wants_set_active = false;
bool skip_secondary = false;
@ -1648,6 +1649,11 @@ int main(int argc, char **argv)
wants_reboot_bootloader = true;
skip(1);
}
if (!strcmp(*argv, "emergency")) {
wants_reboot = false;
wants_reboot_emergency = true;
skip(1);
}
}
require(0);
} else if(!strcmp(*argv, "reboot-bootloader")) {
@ -1807,6 +1813,9 @@ int main(int argc, char **argv)
} else if (wants_reboot_bootloader) {
fb_queue_command("reboot-bootloader", "rebooting into bootloader");
fb_queue_wait_for_disconnect();
} else if (wants_reboot_emergency) {
fb_queue_command("reboot-emergency", "rebooting into emergency download (EDL) mode");
fb_queue_wait_for_disconnect();
}
return fb_execute_queue(transport) ? EXIT_FAILURE : EXIT_SUCCESS;