diff options
| author | Colin Cross <ccross@android.com> | 2012-07-24 18:21:52 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-07-24 18:21:52 -0700 |
| commit | 23ee469c4b790634959e5ccf83134f44e73fb72b (patch) | |
| tree | 2ce41e59f91c2d2fe2772b138c268188cfb42a40 | |
| parent | f650c07586d65ee655eba6d297ebaacffedae29e (diff) | |
| parent | 0bbfb3976e9491b3e1a872ebdaa850ef868a24aa (diff) | |
| download | system_core-23ee469c4b790634959e5ccf83134f44e73fb72b.tar.gz system_core-23ee469c4b790634959e5ccf83134f44e73fb72b.tar.bz2 system_core-23ee469c4b790634959e5ccf83134f44e73fb72b.zip | |
Merge "fastboot: change default sparse limit to disabled"
| -rw-r--r-- | fastboot/fastboot.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c index 59544443..57363d86 100644 --- a/fastboot/fastboot.c +++ b/fastboot/fastboot.c @@ -54,8 +54,6 @@ #define O_BINARY 0 #endif -#define DEFAULT_SPARSE_LIMIT (256 * 1024 * 1024) - char cur_product[FB_RESPONSE_SZ + 1]; void bootimg_set_cmdline(boot_img_hdr *h, const char *cmdline); @@ -281,7 +279,7 @@ void usage(void) " -b <base_addr> specify a custom kernel base address\n" " -n <page size> specify the nand page size. default: 2048\n" " -S <size>[K|M|G] automatically sparse files greater than\n" - " size. default: 256M, 0 to disable\n" + " size. 0 to disable\n" ); } @@ -535,7 +533,7 @@ static int64_t get_sparse_limit(struct usb_handle *usb, int64_t size) if (target_sparse_limit > 0) { limit = target_sparse_limit; } else { - limit = DEFAULT_SPARSE_LIMIT; + return 0; } } |
