Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfbb5f63 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Config: enable techpack display driver compilation for lahaina" into display-kernel.lnx.5.4

parents 5694bc2e a0b168f7

Makefile

+9 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,15 @@ ifeq ($(CONFIG_ARCH_KONA), y) 
LINUXINCLUDE    += -include $(srctree)/techpack/display/config/konadispconf.h

LINUXINCLUDE    += -include $(srctree)/techpack/display/config/konadispconf.h

endif

endif





ifeq ($(CONFIG_ARCH_LAHAINA), y)

include $(srctree)/techpack/display/config/lahainadisp.conf

LINUXINCLUDE    += -include $(srctree)/techpack/display/config/lahainadispconf.h

LINUXINCLUDE    += \

		   -I$(srctree)/techpack/display/include/uapi/display \

		   -I$(srctree)/techpack/display/include

USERINCLUDE     += -I$(srctree)/techpack/display/include/uapi/display

endif



ifeq ($(CONFIG_ARCH_LITO), y)

ifeq ($(CONFIG_ARCH_LITO), y)

include $(srctree)/techpack/display/config/saipdisp.conf

include $(srctree)/techpack/display/config/saipdisp.conf

endif

endif

config/lahainadisp.conf

0 → 100644
+8 −0
Original line number Original line Diff line number Diff line 
export CONFIG_DRM_MSM=y

export CONFIG_DRM_MSM_SDE=y

export CONFIG_SYNC_FILE=y

export CONFIG_DRM_MSM_DSI=y

export CONFIG_DSI_PARSER=y

export CONFIG_DRM_SDE_WB=y

export CONFIG_DRM_MSM_REGISTER_LOGGING=y

export CONFIG_QCOM_MDSS_PLL=y

config/lahainadispconf.h

0 → 100644
+15 −0
Original line number Original line Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2020, The Linux Foundation. All rights reserved.

 */



#define CONFIG_DRM_MSM 1

#define CONFIG_DRM_MSM_SDE 1

#define CONFIG_SYNC_FILE 1

#define CONFIG_DRM_MSM_DSI 1

#define CONFIG_DSI_PARSER 1

#define CONFIG_DRM_SDE_WB 1

#define CONFIG_DRM_MSM_REGISTER_LOGGING 1

#define CONFIG_DRM_SDE_EVTLOG_DEBUG 1

#define CONFIG_QCOM_MDSS_PLL 1

include/uapi/Kbuild

+2 −2
Original line number Original line Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note

# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note





header-y += media/

# Top-level Makefile calls into asm-$(ARCH)

header-y += drm/
 
# List only non-arch directories below

include/uapi/display/Kbuild

0 → 100644
+4 −0
Original line number Original line Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note



header-y += media/

header-y += drm/