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

Commit 5aff24e0 authored by Connor O'Brien's avatar Connor O'Brien Committed by android-build-merger
Browse files

Merge "fastboot: handle small flash block sizes correctly" 

am: ebcfa449

Change-Id: I683e1722756d09b09c18d506f9e08e269b6e1921
parents 2089237e ebcfa449

fastboot/fastboot.cpp

+2 −3
Original line number Diff line number Diff line
@@ -1365,9 +1365,8 @@ static unsigned fb_get_flash_block_size(Transport* transport, std::string name) 
        fprintf(stderr, "Couldn't parse %s '%s'.\n", name.c_str(), sizeString.c_str());

        return 0;

    }

    if (size < 4096 || (size & (size - 1)) != 0) {

        fprintf(stderr, "Invalid %s %u: must be a power of 2 and at least 4096.\n",

                name.c_str(), size);

    if ((size & (size - 1)) != 0) {

        fprintf(stderr, "Invalid %s %u: must be a power of 2.\n", name.c_str(), size);

        return 0;

    }

    return size;

fastboot/fs.cpp

+2 −0
Original line number Diff line number Diff line
@@ -119,6 +119,8 @@ static int generate_ext4_image(const char* fileName, long long partSize, 
        int raid_stripe_width = eraseBlkSize / block_size;

        // stride should be the max of 8kb and logical block size

        if (logicalBlkSize != 0 && logicalBlkSize < 8192) raid_stride = 8192 / block_size;

        // stripe width should be >= stride

        if (raid_stripe_width < raid_stride) raid_stripe_width = raid_stride;

        ext_attr += StringPrintf(",stride=%d,stripe-width=%d", raid_stride, raid_stripe_width);

    }

    mke2fs_args.push_back("-E");