commit fdeb5852f9443af0797f3941ff5782e2f98fe023
author Linux Build Service Account <lnxbuild@localhost> Wed Mar 28 17:40:09 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Mar 28 17:40:09 2018 -0700
tree de1230b286f070b05c2f80bcab4d494ae9df75f2
parent 3dcb6fe56980f83c2f49d0fedff84aaff09cc1b2
parent 463073c3759dcacffe1acef3314ec46f17d62d17

Merge "project: msm8953: Enable secapploader and rpmb support"

project/msm8952.mk

diff --git a/project/msm8952.mk b/project/msm8952.mk
index ee9063c..817499e 100644
--- a/project/msm8952.mk
+++ b/project/msm8952.mk
@@ -14,6 +14,10 @@
 
 EMMC_BOOT := 1
 
+ifeq ($(ENABLE_DISPLAY),1)
+DEFINES += ENABLE_DISPLAY=1
+DEFINES += DISPLAY_SPLASH_SCREEN=1
+endif
 
 ifeq ($(VERIFIED_BOOT),1)
 ENABLE_MDTP_SUPPORT := 1

target/msm8952/rules.mk

diff --git a/target/msm8952/rules.mk b/target/msm8952/rules.mk
index d86ea01..ccc7e92 100644
--- a/target/msm8952/rules.mk
+++ b/target/msm8952/rules.mk
@@ -18,10 +18,6 @@
 SCRATCH_SIZE     := 511
 SCRATCH_SIZE_512 := 234
 
-ifeq ($(ENABLE_DISPLAY),1)
-DEFINES += ENABLE_DISPLAY=1
-DEFINES += DISPLAY_SPLASH_SCREEN=1
-endif
 DEFINES += DISPLAY_TYPE_MIPI=1
 DEFINES += DISPLAY_TYPE_DSI6G=1