From 5349a7940189f6cf3aa2bc113cdc7518280338a4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 19 Feb 2018 01:10:47 -0800 Subject: [PATCH] drivers/gpu/arm/: Help out of source build tree When builing with make O= 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 --- drivers/gpu/arm/mali/Kbuild | 4 ++-- drivers/gpu/arm/ump/Kbuild | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/arm/mali/Kbuild b/drivers/gpu/arm/mali/Kbuild index ea4228adf151..d5e91fcea8ab 100755 --- a/drivers/gpu/arm/mali/Kbuild +++ b/drivers/gpu/arm/mali/Kbuild @@ -25,7 +25,7 @@ MALI_ENABLE_CPU_CYCLES ?= 0 # For customer releases the Linux Device Drivers will be provided as ARM proprietary and GPL releases: # The ARM proprietary product will only include the license/proprietary directory # The GPL product will only include the license/gpl directory -ifeq ($(wildcard $(src)/linux/license/gpl/*),) +ifeq ($(wildcard $(srctree)/$(src)/linux/license/gpl/*),) ccflags-y += -I$(src)/linux/license/proprietary ifeq ($(CONFIG_MALI400_PROFILING),y) $(error Profiling is incompatible with non-GPL license) @@ -57,7 +57,7 @@ ifeq ($(MALI_PLATFORM_FILES),) ifeq ($(CONFIG_ARCH_EXYNOS4),y) EXTRA_DEFINES += -DMALI_FAKE_PLATFORM_DEVICE=1 export MALI_PLATFORM=exynos4 -export MALI_PLATFORM_FILES_BUILDIN = $(notdir $(wildcard $(src)/platform/$(MALI_PLATFORM)/*.c)) +export MALI_PLATFORM_FILES_BUILDIN = $(notdir $(wildcard $(srctree)/$(src)/platform/$(MALI_PLATFORM)/*.c)) export MALI_PLATFORM_FILES_ADD_PREFIX = $(addprefix platform/$(MALI_PLATFORM)/,$(MALI_PLATFORM_FILES_BUILDIN)) endif endif diff --git a/drivers/gpu/arm/ump/Kbuild b/drivers/gpu/arm/ump/Kbuild index 11b9ab56c99b..4437fe65a0ce 100755 --- a/drivers/gpu/arm/ump/Kbuild +++ b/drivers/gpu/arm/ump/Kbuild @@ -13,7 +13,7 @@ CONFIG ?= default # Validate selected config -ifneq ($(shell [ -d $(src)/arch-$(CONFIG) ] && [ -f $(src)/arch-$(CONFIG)/config.h ] && echo "OK"), OK) +ifneq ($(shell [ -d $(srctree)/$(src)/arch-$(CONFIG) ] && [ -f $(srctree)/$(src)/arch-$(CONFIG)/config.h ] && echo "OK"), OK) $(warning Current directory is $(src)) $(error No configuration found for config $(CONFIG). Check that arch-$(CONFIG)/config.h exists) else