diff options
| author | JP Abgrall <jpa@google.com> | 2014-05-06 19:38:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-06 19:38:33 +0000 |
| commit | e95a90e5995d1121080b5da09d75d53093af8818 (patch) | |
| tree | 1188fbcf66f484c8e8dc2e1946a12403384abb71 | |
| parent | 0865127430b7651a96115999ca41a3fe0974f4e7 (diff) | |
| parent | 1762dbfbab7caab7f7e57aaaa5e1491e96e55d42 (diff) | |
| download | system_core-e95a90e5995d1121080b5da09d75d53093af8818.zip system_core-e95a90e5995d1121080b5da09d75d53093af8818.tar.gz system_core-e95a90e5995d1121080b5da09d75d53093af8818.tar.bz2 | |
am 1762dbfb: am 2d2fd4cd: Merge changes Ibff1f74e,Ic82595cf,If4e01cab
* commit '1762dbfbab7caab7f7e57aaaa5e1491e96e55d42':
fastboot: Added tos as an optional image
fastboot: Fixed optional entries
fastboot: allow format on devices with small buffers
| -rw-r--r-- | fastboot/fastboot.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c index 7f49ae9..f98268e 100644 --- a/fastboot/fastboot.c +++ b/fastboot/fastboot.c @@ -100,10 +100,11 @@ static struct { char sig_name[13]; char part_name[9]; bool is_optional; -} images[3] = { +} images[4] = { {"boot.img", "boot.sig", "boot", false}, {"recovery.img", "recovery.sig", "recovery", true}, {"system.img", "system.sig", "system", false}, + {"tos.img", "tos.sig", "tos", true}, }; void get_my_path(char *path); @@ -120,6 +121,8 @@ char *find_item(const char *item, const char *product) fn = "recovery.img"; } else if(!strcmp(item,"system")) { fn = "system.img"; + } else if(!strcmp(item,"tos")) { + fn = "tos.img"; } else if(!strcmp(item,"userdata")) { fn = "userdata.img"; } else if(!strcmp(item,"cache")) { @@ -285,7 +288,7 @@ void usage(void) "\n" "commands:\n" " update <filename> reflash device from update.zip\n" - " flashall flash boot + recovery + system\n" + " flashall flash boot, system, and if found, recovery, tos\n" " flash <partition> [ <filename> ] write a file to a flash partition\n" " erase <partition> erase a flash partition\n" " format <partition> format a flash partition \n" @@ -657,7 +660,7 @@ static int load_buf(usb_handle *usb, const char *fname, fd = open(fname, O_RDONLY | O_BINARY); if (fd < 0) { - die("cannot open '%s'\n", fname); + return -1; } return load_buf_fd(usb, fd, buf); |