commit d71fe05ff3558ee7df93addf39a65bb9beb2be98
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jul 17 20:36:19 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 17 20:36:19 2023 +0000
tree ce07dfb36ab986221b7b8bd63d9aa91ff89d721f
parent 886145de315f28e6998a6bdc1ba50654f4306383
parent 137c11b30843daee399992f3f4767febec3d2302

Merge "db845c/rb5: Make version 4 as the default boot image header" into main am: cf0c9fe4e3 am: 137c11b308

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/2647984

Change-Id: I0bd103ded97db84832eebb81c1a0cf0838128c98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

db845c.mk

diff --git a/db845c.mk b/db845c.mk
index e949af1..ea61e1e 100644
--- a/db845c.mk
+++ b/db845c.mk
@@ -1,7 +1,11 @@
 $(call inherit-product, device/linaro/dragonboard/full.mk)
 $(call inherit-product, device/linaro/dragonboard/db845c/device.mk)
 
-TARGET_USES_BOOT_HDR_V3 ?= true
+ifeq ($(TARGET_KERNEL_USE),5.4)
+  TARGET_USES_BOOT_HDR_V3 := true
+else
+  TARGET_USES_BOOT_HDR_V3 ?= false
+endif
 
 # Product overrides
 PRODUCT_NAME := db845c