commit 5eb270042185544f186cb4ac988afd4dfc210647
author Linux Build Service Account <lnxbuild@localhost> Fri Jul 17 06:43:42 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jul 17 06:43:42 2015 -0700
tree 0d36a2a95695d89c2f3f22853194c679fae4b563
parent 939188baf81a987c2aee1e48cf2531e717ee06e4
parent 55e9f9d7b5bf62e194bf2a38b0252ee66e911d26

Merge "platform: msm_shared: add initial support for fermium"

platform/msm_shared/rules.mk

diff --git a/platform/msm_shared/rules.mk b/platform/msm_shared/rules.mk
index d19df24..d1ebd05 100644
--- a/platform/msm_shared/rules.mk
+++ b/platform/msm_shared/rules.mk
@@ -508,6 +508,23 @@
 			$(LOCAL_DIR)/mipi_dsi_autopll.o
 endif
 
+ifeq ($(PLATFORM),mdmfermium)
+	OBJS += $(LOCAL_DIR)/qgic.o \
+			$(LOCAL_DIR)/qtimer.o \
+			$(LOCAL_DIR)/qtimer_mmap.o \
+			$(LOCAL_DIR)/interrupts.o \
+			$(LOCAL_DIR)/clock.o \
+			$(LOCAL_DIR)/clock_pll.o \
+			$(LOCAL_DIR)/clock_lib2.o \
+			$(LOCAL_DIR)/uart_dm.o \
+			$(LOCAL_DIR)/board.o \
+			$(LOCAL_DIR)/spmi.o \
+			$(LOCAL_DIR)/bam.o \
+			$(LOCAL_DIR)/qpic_nand.o \
+			$(LOCAL_DIR)/scm.o \
+			$(LOCAL_DIR)/dev_tree.o
+endif
+
 ifeq ($(PLATFORM),msm8996)
 DEFINES += DISPLAY_TYPE_MDSS=1
 	OBJS += $(LOCAL_DIR)/qtimer.o \

platform/msm_shared/smem.h

diff --git a/platform/msm_shared/smem.h b/platform/msm_shared/smem.h
index 5067b8a..aa8cd1f 100644
--- a/platform/msm_shared/smem.h
+++ b/platform/msm_shared/smem.h
@@ -428,6 +428,7 @@
 	APQ8076  = 277,
 	MSM8976  = 278,
 	APQ8052  = 289,
+	MDMFERMIUM  = 290,
 	APQ8096  = 291,
 };