commit a7a64579c24b6a6dd41105a85a1fd5901f7cdf14
author Colin Cross <ccross@android.com> Tue Jul 24 18:54:18 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 24 18:54:18 2012 -0700
tree 765a3b2c4817a7ff2b0b0125f3f3e4a987127bc8
parent a2b3ded589759c413c5231a89111e0349e92ec62
parent 36f2e2ac96f8b2163a37773f5cb92cfff75dede2

am 36f2e2ac: am 23ee469c: Merge "fastboot: change default sparse limit to disabled"

* commit '36f2e2ac96f8b2163a37773f5cb92cfff75dede2':
  fastboot: change default sparse limit to disabled

fastboot/fastboot.c

diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index b4262f4..2a63905 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);
@@ -296,7 +294,7 @@
             "  -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"
         );
 }
 
@@ -550,7 +548,7 @@
         if (target_sparse_limit > 0) {
             limit = target_sparse_limit;
         } else {
-            limit = DEFAULT_SPARSE_LIMIT;
+            return 0;
         }
     }