Skip to content

Commit 5349a79

Browse files
committed
drivers/gpu/arm/: Help out of source build tree
When builing with make O=<dir> option this fails with errors since it cant find the header in the relative tree, but prepending srctree is the right thing to do here. Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 parent b5622ab commit 5349a79

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

drivers/gpu/arm/mali/Kbuild

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ MALI_ENABLE_CPU_CYCLES ?= 0
2525
# For customer releases the Linux Device Drivers will be provided as ARM proprietary and GPL releases:
2626
# The ARM proprietary product will only include the license/proprietary directory
2727
# The GPL product will only include the license/gpl directory
28-
ifeq ($(wildcard $(src)/linux/license/gpl/*),)
28+
ifeq ($(wildcard $(srctree)/$(src)/linux/license/gpl/*),)
2929
ccflags-y += -I$(src)/linux/license/proprietary
3030
ifeq ($(CONFIG_MALI400_PROFILING),y)
3131
$(error Profiling is incompatible with non-GPL license)
@@ -57,7 +57,7 @@ ifeq ($(MALI_PLATFORM_FILES),)
5757
ifeq ($(CONFIG_ARCH_EXYNOS4),y)
5858
EXTRA_DEFINES += -DMALI_FAKE_PLATFORM_DEVICE=1
5959
export MALI_PLATFORM=exynos4
60-
export MALI_PLATFORM_FILES_BUILDIN = $(notdir $(wildcard $(src)/platform/$(MALI_PLATFORM)/*.c))
60+
export MALI_PLATFORM_FILES_BUILDIN = $(notdir $(wildcard $(srctree)/$(src)/platform/$(MALI_PLATFORM)/*.c))
6161
export MALI_PLATFORM_FILES_ADD_PREFIX = $(addprefix platform/$(MALI_PLATFORM)/,$(MALI_PLATFORM_FILES_BUILDIN))
6262
endif
6363
endif

drivers/gpu/arm/ump/Kbuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
CONFIG ?= default
1414

1515
# Validate selected config
16-
ifneq ($(shell [ -d $(src)/arch-$(CONFIG) ] && [ -f $(src)/arch-$(CONFIG)/config.h ] && echo "OK"), OK)
16+
ifneq ($(shell [ -d $(srctree)/$(src)/arch-$(CONFIG) ] && [ -f $(srctree)/$(src)/arch-$(CONFIG)/config.h ] && echo "OK"), OK)
1717
$(warning Current directory is $(src))
1818
$(error No configuration found for config $(CONFIG). Check that arch-$(CONFIG)/config.h exists)
1919
else

0 commit comments

Comments
 (0)