From 373224c48b42dd28d21855842291d5747b60d5da Mon Sep 17 00:00:00 2001 From: Jeykumar Sankaran Date: Sun, 3 May 2020 11:23:47 -0700 Subject: [PATCH 1/2] disp: leave header path includes out of target check Don't include header paths while adding config files for specific targets. Signed-off-by: Jeykumar Sankaran Change-Id: Ibab9e46101b59298ff1e42e07ffa391e192a23c6 --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 13f0321b2538..b3001ade0dee 100644 --- a/Makefile +++ b/Makefile @@ -17,11 +17,12 @@ LINUXINCLUDE += -include $(srctree)/techpack/display/config/lahainadispconf.h include $(srctree)/techpack/display/config/gki_lahainadisp.conf LINUXINCLUDE += -include $(srctree)/techpack/display/config/gki_lahainadispconf.h endif +endif + 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) include $(srctree)/techpack/display/config/saipdisp.conf From e0b15f4dbc6133bf7ad10b66bc10221b26fb3402 Mon Sep 17 00:00:00 2001 From: Jeykumar Sankaran Date: Sun, 3 May 2020 11:24:51 -0700 Subject: [PATCH 2/2] disp: fix compilation issue with trusted VM config This is temporary change to avoid compilation issues on genericarmv8 recipe. This will be reverted once the display support is added for the recipe. Change-Id: I805cf0b98ed77d9d4af72422a2a5b2533658ab73 Signed-off-by: Jeykumar Sankaran --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index b3001ade0dee..55b24b1db8db 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ ifeq ($(CONFIG_ARCH_KONA), y) LINUXINCLUDE += -include $(srctree)/techpack/display/config/konadispconf.h endif +ifneq ($(CONFIG_ARCH_QTI_VM), y) ifeq ($(CONFIG_ARCH_LAHAINA), y) ifeq ($(CONFIG_QGKI), y) include $(srctree)/techpack/display/config/lahainadisp.conf @@ -18,6 +19,7 @@ LINUXINCLUDE += -include $(srctree)/techpack/display/config/lahainadispconf.h LINUXINCLUDE += -include $(srctree)/techpack/display/config/gki_lahainadispconf.h endif endif +endif LINUXINCLUDE += \ -I$(srctree)/techpack/display/include/uapi/display \