commit da2cc3d361e9fe04515180dba2a674af5d531663
author Vladislav Levenetz <vlevenetz@codeaurora.org> Wed Apr 05 08:54:50 2017 +0300
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Apr 18 02:29:19 2017 -0700
tree 17fa29024727e517e8997a830e0d8b1aa1e924a6
parent 1452844059bcde14b6c4f7f21e73967321e777c9

project,target: msm8953: check for ENABLE_DISPLAY flag

The flag can be set through device's BoardConfig.mk var BOOTLOADER_DISABLE_DISPLAY

Change-Id: I14aa8c51ad01b7810b3a46b9cd2e3bfd44421cd4

project/msm8953.mk

diff --git a/project/msm8953.mk b/project/msm8953.mk
index 126c7ba..2359c74 100644
--- a/project/msm8953.mk
+++ b/project/msm8953.mk
@@ -20,10 +20,12 @@
 else
 ENABLE_SECAPP_LOADER := 1
 ENABLE_RPMB_SUPPORT := 1
+ifneq (,$(findstring DISPLAY_SPLASH_SCREEN,$(DEFINES)))
 #enable fbcon display menu
 ENABLE_FBCON_DISPLAY_MSG := 1
 endif
 endif
+endif
 
 ENABLE_SMD_SUPPORT := 1
 #ENABLE_PWM_SUPPORT := true
@@ -107,9 +109,11 @@
 ENABLE_REBOOT_MODULE := 1
 
 ifeq ($(VERIFIED_BOOT),1)
+ifneq (,$(findstring DISPLAY_SPLASH_SCREEN,$(DEFINES)))
 #Enable MDTP feature
 ENABLE_MDTP_SUPPORT := 1
 endif
+endif
 
 ifeq ($(ENABLE_MDTP_SUPPORT),1)
 DEFINES += MDTP_SUPPORT=1

target/msm8953/rules.mk

diff --git a/target/msm8953/rules.mk b/target/msm8953/rules.mk
index 93a5661..1957d9c 100644
--- a/target/msm8953/rules.mk
+++ b/target/msm8953/rules.mk
@@ -4,9 +4,7 @@
 
 INCLUDES += -I$(LK_TOP_DIR)/dev/gcdb/display -I$(LK_TOP_DIR)/dev/gcdb/display/include
 
-ifeq ($(ENABLE_MDTP_SUPPORT),1)
 INCLUDES += -I$(LK_TOP_DIR)/app/aboot
-endif
 
 PLATFORM := msm8953
 
@@ -17,7 +15,10 @@
 SCRATCH_ADDR     := 0xA0100000
 
 DEFINES += PMI_CONFIGURED=1
+ifeq ($(ENABLE_DISPLAY),1)
+DEFINES += ENABLE_DISPLAY=1
 DEFINES += DISPLAY_SPLASH_SCREEN=1
+endif
 DEFINES += DISPLAY_TYPE_MIPI=1
 DEFINES += DISPLAY_TYPE_DSI6G=1