am 58b81bf8: am a82f2b25: Merge "Support "fastboot reboot bootloader"."

* commit '58b81bf81b2fc67cffe5908a38291f32256a0ea2':
  Support "fastboot reboot bootloader".
This commit is contained in:
Elliott Hughes 2015-02-25 18:50:40 +00:00 committed by Android Git Automerger
commit 0beef09b1c

View file

@ -300,7 +300,7 @@ void usage(void)
" flash it\n"
" devices list all connected devices\n"
" continue continue with autoboot\n"
" reboot reboot device normally\n"
" reboot [bootloader] reboot device, optionally into bootloader\n"
" reboot-bootloader reboot device into bootloader\n"
" help show this help message\n"
"\n"
@ -1153,6 +1153,14 @@ int main(int argc, char **argv)
} else if(!strcmp(*argv, "reboot")) {
wants_reboot = 1;
skip(1);
if (argc > 0) {
if (!strcmp(*argv, "bootloader")) {
wants_reboot = 0;
wants_reboot_bootloader = 1;
skip(1);
}
}
require(0);
} else if(!strcmp(*argv, "reboot-bootloader")) {
wants_reboot_bootloader = 1;
skip(1);