commit 47d3855f5a488c6e99678bcebcda244acd0c8c4e
author Linux Build Service Account <lnxbuild@localhost> Thu Mar 29 05:11:47 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Mar 29 05:11:47 2018 -0700
tree 3af6ebf17d3419bce21628f9af401ebd44de0420
parent fdeb5852f9443af0797f3941ff5782e2f98fe023
parent 3ce8b63bb820545891bc0e1941443929ede4fc19

Merge "project: msm8952: Add support to have reboot reason in PON register"

project/msm8952.mk

diff --git a/project/msm8952.mk b/project/msm8952.mk
index a72a7b8..d40dfa1 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

project/msm8953.mk

diff --git a/project/msm8953.mk b/project/msm8953.mk
index f144fd5..f9a9644 100644
--- a/project/msm8953.mk
+++ b/project/msm8953.mk
@@ -19,9 +19,10 @@
 DEFINES += DISPLAY_SPLASH_SCREEN=1
 endif
 
-ifeq ($(VERIFIED_BOOT),1)
 ENABLE_SECAPP_LOADER := 1
 ENABLE_RPMB_SUPPORT := 1
+
+ifeq ($(VERIFIED_BOOT),1)
 ifneq (,$(findstring DISPLAY_SPLASH_SCREEN,$(DEFINES)))
 #enable fbcon display menu
 ENABLE_FBCON_DISPLAY_MSG := 1
@@ -29,8 +30,6 @@
 endif
 
 ifeq ($(VERIFIED_BOOT_2),1)
-  ENABLE_SECAPP_LOADER := 1
-  ENABLE_RPMB_SUPPORT := 1
 ifneq (,$(findstring DISPLAY_SPLASH_SCREEN,$(DEFINES)))
 #enable fbcon display menu
   ENABLE_FBCON_DISPLAY_MSG := 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