Skip to content

Commit

Permalink
drm: pvrsgx: 1.8.869593: fix Makefile for out-of-tree builds since v6…
Browse files Browse the repository at this point in the history
….9-rc1

With upstream commit b1992c3 ("kbuild: use $(src) instead of $(srctree)/$(src) for source directory")
the logic of $(srctree) and $(src) has changed.

Consequently, $(srctree)/$(src) in upstream Makefiles need to be replaced with $(src).

Bug reported: #16

Signed-off-by: H. Nikolaus Schaller <[email protected]>
  • Loading branch information
goldelico committed Oct 29, 2024
1 parent ac387d9 commit 7d8e3c1
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions drivers/gpu/drm/pvrsgx/1.8.869593/eurasia_km/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,24 @@ ccflags-y += \
-I$(srctree)/include \
-I$(srctree)/arch/arm/mach-omap2 \
-I$(srctree)/drivers/video/fbdev/omap2 \
-I$(srctree)/$(src)/ \
-I$(srctree)/$(src)/include4 \
-I$(srctree)/$(src)/services4/include \
-I$(srctree)/$(src)/services4/include/env/linux \
-I$(srctree)/$(src)/services4/system/include \
-I$(srctree)/$(src)/services4/srvkm/bridged \
-I$(srctree)/$(src)/services4/srvkm/bridged/sgx \
-I$(srctree)/$(src)/services4/srvkm/devices/sgx \
-I$(srctree)/$(src)/services4/srvkm/env/linux \
-I$(srctree)/$(src)/services4/srvkm/hwdefs \
-I$(srctree)/$(src)/services4/srvkm/include \
-I$(srctree)/$(src)/services4/3rdparty/bufferclass_ti \
-I$(src)/ \
-I$(src)/include4 \
-I$(src)/services4/include \
-I$(src)/services4/include/env/linux \
-I$(src)/services4/system/include \
-I$(src)/services4/srvkm/bridged \
-I$(src)/services4/srvkm/bridged/sgx \
-I$(src)/services4/srvkm/devices/sgx \
-I$(src)/services4/srvkm/env/linux \
-I$(src)/services4/srvkm/hwdefs \
-I$(src)/services4/srvkm/include \
-I$(src)/services4/3rdparty/bufferclass_ti \
-I$(srctree)/include/linux

# choose SoC integration variant to choose the right source subtree

ccflags-y += \
-I$(srctree)/$(src)/services4/system/$(SOC_FAMILY)
-I$(src)/services4/system/$(SOC_FAMILY)

ifeq ($(SOC_FAMILY),omap)
$(TARGET) += \
Expand Down Expand Up @@ -230,7 +230,7 @@ endif
# $(TARGET) += services4/3rdparty/linux_drm/pvr_drm_stubs.o

ccflags-y += -I$(srctree)/include/drm \
-I$(srctree)/$(src)/services4/3rdparty/linux_drm
-I$(src)/services4/3rdparty/linux_drm

ccflags-y += -DSUPPORT_HW_RECOVERY
ccflags-y += -DPVR_LINUX_USING_WORKQUEUES
Expand Down Expand Up @@ -269,7 +269,7 @@ endif
ifneq ($(SUPPORT_OMAPLFB),)

ccflags-y += \
-I$(srctree)/$(src)/services4/3rdparty/dc_omapfb3_linux \
-I$(src)/services4/3rdparty/dc_omapfb3_linux \
-DFBDEV_PRESENT=1 \
-DSUPPORT_OMAP3430_OMAPFB3 \
-DDISPLAY_CONTROLLER=omaplfb \
Expand Down

0 comments on commit 7d8e3c1

Please sign in to comment.