Merge "dragonboard: Update vendor-firmware-package to 20220210"
diff --git a/Android.mk b/Android.mk
index ed787c7..ca9d582 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,6 +24,16 @@
 
 LOCAL_PATH := $(call my-dir)
 
+$(eval $(call declare-1p-copy-files,device/linaro/dragonboard,.conf))
+$(eval $(call declare-1p-copy-files,device/linaro/dragonboard,.kl))
+$(eval $(call declare-1p-copy-files,device/linaro/dragonboard,.policy))
+$(eval $(call declare-1p-copy-files,device/linaro/dragonboard,.rc))
+$(eval $(call declare-1p-copy-files,device/linaro/dragonboard,.sh))
+$(eval $(call declare-1p-copy-files,device/linaro/dragonboard,.xml))
+$(eval $(call declare-1p-copy-files,device/linaro/dragonboard,fstab.db845c))
+$(eval $(call declare-1p-copy-files,device/linaro/dragonboard,fstab.pixel3_mainline))
+$(eval $(call declare-1p-copy-files,device/linaro/dragonboard,fstab.rb5))
+
 # If some modules are built directly from this directory (not subdirectories),
 # their rules should be written here.
 
diff --git a/db845c/BoardConfig.mk b/db845c/BoardConfig.mk
index 7ef8549..2a23017 100644
--- a/db845c/BoardConfig.mk
+++ b/db845c/BoardConfig.mk
@@ -6,6 +6,7 @@
 
 TARGET_NO_KERNEL := false
 BOARD_INCLUDE_DTB_IN_BOOTIMG := true
+TARGET_USES_BOOT_HDR_V3 ?= true
 ifeq ($(TARGET_USES_BOOT_HDR_V3), true)
  BOARD_BOOT_HEADER_VERSION := 3
  BOARD_KERNEL_PAGESIZE := 4096