Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7a64579 authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

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

* commit '36f2e2ac':
  fastboot: change default sparse limit to disabled
parents a2b3ded5 36f2e2ac
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -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 @@ 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"
        );
}

@@ -550,7 +548,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;
        }
    }