commit 30dafe8873ee6d86bfda5cb85e3b4f1a78d22ed5
author Hridya Valsaraju <hridya@google.com> Mon Apr 16 18:44:15 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 16 18:44:15 2018 -0700
tree f6f45ff2562025c5b9b087c34e94f717c9fe5570
parent bb6232966c77d2b76d59a32d16cfb5b646089939
parent d063ffdeda6dd2e5ecc0fd527ade5cd9a7d0fe1f

Merge "Remove header version check for command "fastboot boot boot.img""
am: b245377f0e

Change-Id: Ibbb42dd2cc376874a518a5082aa2e1316c01ec87

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 3a3503e..41a3d6b 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -410,12 +410,6 @@
         if (!g_cmdline.empty()) {
             bootimg_set_cmdline(reinterpret_cast<boot_img_hdr_v1*>(kdata), g_cmdline);
         }
-        uint32_t header_version_existing =
-                reinterpret_cast<boot_img_hdr_v1*>(kdata)->header_version;
-        if (g_boot_img_hdr.header_version != header_version_existing) {
-            die("header version mismatch, expected: %" PRIu32 " found %" PRIu32 "",
-                g_boot_img_hdr.header_version, header_version_existing);
-        }
 
         if (!ramdisk.empty()) die("cannot boot a boot.img *and* ramdisk");