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

Commit b36934bf authored by Steve Muckle's avatar Steve Muckle
Browse files

fastboot: add support for v3 boot header format 

Support v3 header format when changing the command line with
fastboot boot or using flash:raw.

Bug: 151750405
Test: fastboot boot and flash:raw with updated cmdline and v3 header
Merged-In: Ibf396e2d18d8b22cad50db290f3fd4e46ff85d9b
Change-Id: Ibf396e2d18d8b22cad50db290f3fd4e46ff85d9b
parent 5a495bec

fastboot/bootimg_utils.cpp

+40 −0
Original line number Diff line number Diff line
@@ -34,14 +34,54 @@ 
#include <stdlib.h>

#include <string.h>



static void bootimg_set_cmdline_v3(boot_img_hdr_v3* h, const std::string& cmdline) {

    if (cmdline.size() >= sizeof(h->cmdline)) die("command line too large: %zu", cmdline.size());

    strcpy(reinterpret_cast<char*>(h->cmdline), cmdline.c_str());

}



void bootimg_set_cmdline(boot_img_hdr_v2* h, const std::string& cmdline) {

    if (h->header_version == 3) {

        return bootimg_set_cmdline_v3(reinterpret_cast<boot_img_hdr_v3*>(h), cmdline);

    }

    if (cmdline.size() >= sizeof(h->cmdline)) die("command line too large: %zu", cmdline.size());

    strcpy(reinterpret_cast<char*>(h->cmdline), cmdline.c_str());

}



static boot_img_hdr_v3* mkbootimg_v3(const std::vector<char>& kernel,

                                     const std::vector<char>& ramdisk, const boot_img_hdr_v2& src,

                                     std::vector<char>* out) {

#define V3_PAGE_SIZE 4096

    const size_t page_mask = V3_PAGE_SIZE - 1;

    int64_t kernel_actual = (kernel.size() + page_mask) & (~page_mask);

    int64_t ramdisk_actual = (ramdisk.size() + page_mask) & (~page_mask);



    int64_t bootimg_size = V3_PAGE_SIZE + kernel_actual + ramdisk_actual;

    out->resize(bootimg_size);



    boot_img_hdr_v3* hdr = reinterpret_cast<boot_img_hdr_v3*>(out->data());



    memcpy(hdr->magic, BOOT_MAGIC, BOOT_MAGIC_SIZE);

    hdr->kernel_size = kernel.size();

    hdr->ramdisk_size = ramdisk.size();

    hdr->os_version = src.os_version;

    hdr->header_size = sizeof(boot_img_hdr_v3);

    hdr->header_version = 3;



    memcpy(hdr->magic + V3_PAGE_SIZE, kernel.data(), kernel.size());

    memcpy(hdr->magic + V3_PAGE_SIZE + kernel_actual, ramdisk.data(), ramdisk.size());



    return hdr;

}



boot_img_hdr_v2* mkbootimg(const std::vector<char>& kernel, const std::vector<char>& ramdisk,

                           const std::vector<char>& second, const std::vector<char>& dtb,

                           size_t base, const boot_img_hdr_v2& src, std::vector<char>* out) {

    if (src.header_version == 3) {

        if (!second.empty() || !dtb.empty()) {

            die("Second stage bootloader and dtb not supported in v3 boot image\n");

        }

        return reinterpret_cast<boot_img_hdr_v2*>(mkbootimg_v3(kernel, ramdisk, src, out));

    }

    const size_t page_mask = src.page_size - 1;



    int64_t header_actual = (sizeof(boot_img_hdr_v1) + page_mask) & (~page_mask);

fastboot/fastboot.cpp

+2 −2
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ static std::vector<char> LoadBootableImage(const std::string& kernel, const std: 
    }



    // Is this actually a boot image?

    if (kernel_data.size() < sizeof(boot_img_hdr_v2)) {

    if (kernel_data.size() < sizeof(boot_img_hdr_v3)) {

        die("cannot load '%s': too short", kernel.c_str());

    }

    if (!memcmp(kernel_data.data(), BOOT_MAGIC, BOOT_MAGIC_SIZE)) {
@@ -493,7 +493,7 @@ static std::vector<char> LoadBootableImage(const std::string& kernel, const std: 


    std::vector<char> dtb_data;

    if (!g_dtb_path.empty()) {

        if (g_boot_img_hdr.header_version < 2) {

        if (g_boot_img_hdr.header_version != 2) {

                    die("Argument dtb not supported for boot image header version %d\n",

                        g_boot_img_hdr.header_version);

        }