commit c5eb7c30289f31f1a43260340eea71424dc49c6d
author Linux Build Service Account <lnxbuild@localhost> Sat Nov 07 07:53:41 2015 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Nov 07 07:53:41 2015 -0800
tree ddc676ec2935eb95748dad8ed4aec00ceaed986f
parent 4552cbae1b58dd64485a1d915a194295c57a39f5
parent 699466e68bc0f2cb9139760e402d9b44f214a8b8

Merge "Merge remote-tracking branch 'master' into m_master"

include/platform.h

diff --git a/include/platform.h b/include/platform.h
index b23f125..de6e544 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -65,6 +65,7 @@
 int platform_is_msm8939();
 int platform_is_msm8909();
 int platform_is_msm8992();
+int platform_is_msm8937();
 int platform_is_msm8956();
 uint32_t platform_is_msm8976_v_1_1();
 int boot_device_mask(int);

platform/msm8952/platform.c

diff --git a/platform/msm8952/platform.c b/platform/msm8952/platform.c
index 5a8e716..e3e8948 100644
--- a/platform/msm8952/platform.c
+++ b/platform/msm8952/platform.c
@@ -177,6 +177,24 @@
 	return 256;
 }
 
+int platform_is_msm8937()
+{
+	uint32_t platform = board_platform_id();
+	uint32_t ret = 0;
+
+	switch(platform)
+	{
+		case MSM8937:
+		case APQ8037:
+			ret = 1;
+			break;
+		default:
+			ret = 0;
+		};
+
+	return ret;
+}
+
 int platform_is_msm8956()
 {
 	uint32_t platform = board_platform_id();

target/msm8952/rules.mk

diff --git a/target/msm8952/rules.mk b/target/msm8952/rules.mk
index c199e56..3eaf841 100644
--- a/target/msm8952/rules.mk
+++ b/target/msm8952/rules.mk
@@ -14,7 +14,6 @@
 BASE_ADDR        := 0x80000000
 SCRATCH_ADDR     := 0x90100000
 
-DEFINES += DISPLAY_SPLASH_SCREEN=1
 DEFINES += DISPLAY_TYPE_MIPI=1
 DEFINES += DISPLAY_TYPE_DSI6G=1