فهرست منبع

Revert "disp: msm: compile pineapple msm with mm-drivers"

This reverts commit 473453a8d9b738c1d583be3472d82c372ec135fa.
This change decouples mm driver and display driver until mm
driver compilation is enabled.

Change-Id: I1b462d059b26242b6b77b0bc6ad990d7dabcb0ac
Signed-off-by: Nilaan Gunabalachandran <[email protected]>
Nilaan Gunabalachandran 2 سال پیش
والد
کامیت
db39fcc5bc
3فایلهای تغییر یافته به همراه3 افزوده شده و 9 حذف شده
  1. 0 1
      config/gki_pineappledisp.conf
  2. 0 1
      config/gki_pineappledispconf.h
  3. 3 7
      msm/Android.mk

+ 0 - 1
config/gki_pineappledisp.conf

@@ -14,4 +14,3 @@ export CONFIG_DISPLAY_BUILD=m
 export CONFIG_HDCP_QSEECOM=n
 export CONFIG_DRM_SDE_VM=n
 export CONFIG_QTI_HW_FENCE=n
-export CONFIG_QCOM_SPEC_SYNC=y

+ 0 - 1
config/gki_pineappledispconf.h

@@ -22,4 +22,3 @@
 #define CONFIG_HDCP_QSEECOM 0
 #define CONFIG_DRM_SDE_VM 0
 #define CONFIG_QTI_HW_FENCE 0
-#define CONFIG_QCOM_SPEC_SYNC 1

+ 3 - 7
msm/Android.mk

@@ -29,12 +29,10 @@ ifneq ($(TARGET_BOARD_PLATFORM), taro)
 	KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM,msm-ext-disp-module-symvers)/Module.symvers
 	KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM,sec-module-symvers)/Module.symvers
 	KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM,hw-fence-module-symvers)/Module.symvers
-endif
-endif
-ifneq ($(TARGET_BOARD_PLATFORM), taro)
 	KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM,sync-fence-module-symvers)/Module.symvers
 endif
 endif
+endif
 
 ###########################################################
 include $(CLEAR_VARS)
@@ -53,16 +51,14 @@ ifneq ($(TARGET_BOARD_PLATFORM), taro)
 	LOCAL_REQUIRED_MODULES    += msm-ext-disp-module-symvers
 	LOCAL_REQUIRED_MODULES    += sec-module-symvers
 	LOCAL_REQUIRED_MODULES    += hw-fence-module-symvers
+	LOCAL_REQUIRED_MODULES    += sync-fence-module-symvers
 	LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,msm-ext-disp-module-symvers)/Module.symvers
 	LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,sec-module-symvers)/Module.symvers
 	LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,hw-fence-module-symvers)/Module.symvers
-endif
-endif
-ifneq ($(TARGET_BOARD_PLATFORM), taro)
-	LOCAL_REQUIRED_MODULES    += sync-fence-module-symvers
 	LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,sync-fence-module-symvers)/Module.symvers
 endif
 endif
+endif
 
 include $(DLKM_DIR)/Build_external_kernelmodule.mk
 ###########################################################