diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-03-17 17:15:47 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-03-18 09:29:29 -0700 |
| commit | 83b65486beffc7c86f24c428fbb7b50bbbe189f9 (patch) | |
| tree | ab343e30dd96348d35b0957453fbf6b7b0bac56d /fastboot/fastboot.c | |
| parent | 4a4c9f6f98055918f1ebff06b3cc1ed622c058fe (diff) | |
| parent | e037fd7e193ecccbb5c0888e49f6d58c224bc11d (diff) | |
| download | system_core-83b65486beffc7c86f24c428fbb7b50bbbe189f9.tar.gz system_core-83b65486beffc7c86f24c428fbb7b50bbbe189f9.tar.bz2 system_core-83b65486beffc7c86f24c428fbb7b50bbbe189f9.zip | |
Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
init/devices.c
libpixelflinger/Android.mk
Diffstat (limited to 'fastboot/fastboot.c')
| -rw-r--r-- | fastboot/fastboot.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c index 4079a389..e220dbea 100644 --- a/fastboot/fastboot.c +++ b/fastboot/fastboot.c @@ -195,7 +195,7 @@ void usage(void) "\n" "commands:\n" " update <filename> reflash device from update.zip\n" - " flashall 'flash boot' + 'flash system'\n" + " flashall flash boot + recovery + system\n" " flash <partition> [ <filename> ] write a file to a flash partition\n" " erase <partition> erase a flash partition\n" " getvar <variable> display a bootloader variable\n" @@ -588,6 +588,9 @@ int main(int argc, char **argv) } else if(!strcmp(*argv, "reboot-bootloader")) { wants_reboot_bootloader = 1; skip(1); + } else if (!strcmp(*argv, "continue")) { + fb_queue_command("continue", "resuming boot"); + skip(1); } else if(!strcmp(*argv, "boot")) { char *kname = 0; char *rname = 0; |