commit b5083a3c2342d6dadeb492f0aef2fc4c6a3600f6
author Treehugger Robot <treehugger-gerrit@google.com> Fri Nov 09 21:12:48 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 09 21:12:48 2018 +0000
tree 1ec849ef36586cd23a43c9f3e23421cd1bebf586
parent ea370f3c07e0621dcc660b794ee0f223347e8feb
parent a6bb66b87c538a60067c7b37cdfa044d55dba347

Merge "hikey960: Add build option TARGET_BUILTIN_EDID"

hikey960/BoardConfig.mk

diff --git a/hikey960/BoardConfig.mk b/hikey960/BoardConfig.mk
index a670f4f..49fd4e0 100644
--- a/hikey960/BoardConfig.mk
+++ b/hikey960/BoardConfig.mk
@@ -11,6 +11,10 @@
 BOARD_KERNEL_CMDLINE := androidboot.hardware=hikey960 console=ttyFIQ0 androidboot.console=ttyFIQ0
 BOARD_KERNEL_CMDLINE += firmware_class.path=/vendor/firmware loglevel=15 efi=noruntime
 
+ifeq ($(TARGET_BUILTIN_EDID), true)
+BOARD_KERNEL_CMDLINE += drm_kms_helper.edid_firmware=edid/1920x1080.bin
+endif
+
 ifneq ($(TARGET_ANDROID_VERITY),)
 # Enable dtb fstab for treble, with verity and system-as-root
 # NOTE: Disabled by default until b/111829702 is fixed