From a36cdf6368711e3e3e61ffcac018fa49e7180ba5 Mon Sep 17 00:00:00 2001 From: Raviteja Tamatam Date: Fri, 10 Jul 2020 04:18:37 +0530 Subject: [PATCH] disp: msm: make rotator in msm_drm module Make msm_drm into single module where rotator is not separately compiled as different object. Change-Id: I534cc19e6762c8584b6b87c2246b07beb85f84f4 Signed-off-by: Raviteja Tamatam --- Makefile | 1 - msm/Makefile | 17 +++++++++++++++++ rotator/Makefile | 25 ------------------------- 3 files changed, 17 insertions(+), 26 deletions(-) delete mode 100644 rotator/Makefile diff --git a/Makefile b/Makefile index 55b24b1db8db..cd65b53c92ab 100644 --- a/Makefile +++ b/Makefile @@ -43,4 +43,3 @@ LINUXINCLUDE += -include $(srctree)/techpack/display/config/bengaldispconf.h endif obj-$(CONFIG_DRM_MSM) += msm/ -obj-$(CONFIG_MSM_SDE_ROTATOR) += rotator/ diff --git a/msm/Makefile b/msm/Makefile index cbaf7cdf1361..8529c1e92dc7 100644 --- a/msm/Makefile +++ b/msm/Makefile @@ -131,4 +131,21 @@ msm_drm-$(CONFIG_DRM_MSM) += \ msm_drm-$(CONFIG_HDCP_QSEECOM) += ../hdcp/msm_hdcp.o \ +msm_drm-$(CONFIG_MSM_SDE_ROTATOR) += ../rotator/sde_rotator_dev.o \ + ../rotator/sde_rotator_core.o \ + ../rotator/sde_rotator_base.o \ + ../rotator/sde_rotator_formats.o \ + ../rotator/sde_rotator_util.o \ + ../rotator/sde_rotator_io_util.o \ + ../rotator/sde_rotator_smmu.o \ + ../rotator/sde_rotator_r1_wb.o \ + ../rotator/sde_rotator_r1_pipe.o \ + ../rotator/sde_rotator_r1_ctl.o \ + ../rotator/sde_rotator_r1.o \ + ../rotator/sde_rotator_r3.o \ + ../rotator/sde_rotator_sync.o \ + ../rotator/sde_rotator_debug.o \ + ../rotator/sde_rotator_r1_debug.o \ + ../rotator/sde_rotator_r3_debug.o + obj-$(CONFIG_DISPLAY_BUILD) += msm_drm.o diff --git a/rotator/Makefile b/rotator/Makefile deleted file mode 100644 index d72ac73a8bbc..000000000000 --- a/rotator/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only - -ccflags-y += -I$(src) -Idrivers/staging/android - -obj-$(CONFIG_MSM_SDE_ROTATOR) += sde_rotator_dev.o \ - sde_rotator_dev.o \ - sde_rotator_core.o \ - sde_rotator_base.o \ - sde_rotator_formats.o \ - sde_rotator_util.o \ - sde_rotator_io_util.o \ - sde_rotator_smmu.o \ - sde_rotator_r1_wb.o \ - sde_rotator_r1_pipe.o \ - sde_rotator_r1_ctl.o \ - sde_rotator_r1.o \ - sde_rotator_r3.o \ - -obj-$(CONFIG_SYNC_FILE) += \ - sde_rotator_sync.o \ - -obj-$(CONFIG_DEBUG_FS) += \ - sde_rotator_debug.o \ - sde_rotator_r1_debug.o \ - sde_rotator_r3_debug.o \