openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "fastboot: correct set_active behavior" 

am: 275d091441

* commit '275d091441db09609a7d3ecc45976edd64a32299':
  fastboot: correct set_active behavior
This commit is contained in:
Daniel Rosenberg 2016-01-06 19:47:36 +00:00 committed by android-build-merger
parent 0261ae4bb5 275d091441
commit f88b8cbe15
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fastboot/fastboot.cpp
View File

@ -282,8 +282,6 @@ static void usage() {
" getvar <variable> Display a bootloader variable.\n"
" set_active <suffix> Sets the active slot. If slots are\n"
" not supported, this does nothing.\n"
" note: suffixes starting with a '-'\n"
" must use set_active -- <suffix>\n"
" boot <kernel> [ <ramdisk> [ <second> ] ] Download and boot kernel.\n"
" flash:raw boot <kernel> [ <ramdisk> [ <second> ] ]\n"
" Create bootimage and flash it.\n"
@ -1411,7 +1409,6 @@ int main(int argc, char **argv)
std::string slot = verify_slot(transport, argv[1], false);
fb_set_active(slot.c_str());
skip(2);
wants_reboot = true;
} else if(!strcmp(*argv, "oem")) {
argc = do_oem_command(argc, argv);
} else if(!strcmp(*argv, "flashing")) {