ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fastboot/fastboot.c
View file

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