diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-04-17 19:37:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-17 19:37:43 +0000 |
| commit | ab90190dda67557f8c532b2655bc2312070a2d9b (patch) | |
| tree | 2967407aadbf18fc3f5d04e54e4d3c495b51c72a /fastboot/fastboot.cpp | |
| parent | b35c019d5c8a8dde9bc83f5edd8d579198263a35 (diff) | |
| parent | 11a52dda76a97856b9b0bfb97ad572e63824ff6f (diff) | |
Merge "Remove header version check for command "fastboot boot boot.img"" into pi-dev
Diffstat (limited to 'fastboot/fastboot.cpp')
| -rw-r--r-- | fastboot/fastboot.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp index 0ce385599a..5017ebda07 100644 --- a/fastboot/fastboot.cpp +++ b/fastboot/fastboot.cpp @@ -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"); |