Merge "Remove header version check for command "fastboot boot boot.img"" into pi-dev

This commit is contained in:
TreeHugger Robot 2018-04-17 19:37:43 +00:00 committed by Android (Google) Code Review
commit ab90190dda
1 changed files with 0 additions and 6 deletions

View File

@ -457,12 +457,6 @@ static void* load_bootable_image(const std::string& kernel, const std::string& r
}
if (!memcmp(kdata, BOOT_MAGIC, BOOT_MAGIC_SIZE)) {
if (cmdline) bootimg_set_cmdline(reinterpret_cast<boot_img_hdr_v1*>(kdata), cmdline);
uint32_t header_version_existing =
reinterpret_cast<boot_img_hdr_v1*>(kdata)->header_version;
if (header_version != header_version_existing) {
die("header version mismatch, expected: %" PRIu32 " found %" PRIu32 "",
header_version, header_version_existing);
}
if (!ramdisk.empty()) die("cannot boot a boot.img *and* ramdisk");