commit 4c2fbdbcd71d28c646194f97163512f1bd54da95
author Linux Build Service Account <lnxbuild@quicinc.com> Fri Dec 22 13:15:49 2017 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Dec 22 13:15:49 2017 -0800
tree 6d61e958a45f9c56cf9b00896f6c4a4cfdcf9748
parent 51aec96f6fb70331429da292c6583ecab2ed2a39
parent a83b977535607a8369a5c3f58a69e5a75a3a99d8

Merge "target: msm8909: Define display specific configurations in makefile."

project/msm8909.mk

diff --git a/project/msm8909.mk b/project/msm8909.mk
index f7525f9..07815f2 100644
--- a/project/msm8909.mk
+++ b/project/msm8909.mk
@@ -14,6 +14,11 @@
 
 EMMC_BOOT := 1
 
+ifeq ($(ENABLE_DISPLAY),1)
+DEFINES += ENABLE_DISPLAY=1
+DEFINES += DISPLAY_SPLASH_SCREEN=1
+endif
+
 ifeq ($(VERIFIED_BOOT),1)
 ENABLE_SECAPP_LOADER := 1
 ENABLE_RPMB_SUPPORT := 1

target/msm8909/rules.mk

diff --git a/target/msm8909/rules.mk b/target/msm8909/rules.mk
index 5dbd21a..1550990 100644
--- a/target/msm8909/rules.mk
+++ b/target/msm8909/rules.mk
@@ -11,10 +11,6 @@
 BASE_ADDR        := 0x80000000
 SCRATCH_ADDR     := 0x90100000
 
-ifeq ($(ENABLE_DISPLAY),1)
-DEFINES += ENABLE_DISPLAY=1
-DEFINES += DISPLAY_SPLASH_SCREEN=1
-endif
 DEFINES += DISPLAY_TYPE_MIPI=1
 DEFINES += DISPLAY_TYPE_DSI6G=1
 DEFINES += NO_ALARM_DISPLAY=0