Skip to content

Commit

Permalink
fix building to separate output dir (arg O=)
Browse files Browse the repository at this point in the history
  • Loading branch information
C457 authored and tobigun committed Dec 30, 2016
1 parent eeb64a0 commit 30d7fd5
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
34 changes: 17 additions & 17 deletions drivers/gpu/arm/mali400/r4p0_rel0/Kbuild
Expand Up @@ -37,17 +37,17 @@ ifeq ($(CONFIG_SOC_EXYNOS3470),y)
TARGET_PLATFORM=exynos3470
endif

include $(src)/MALI_CONFIGURATION
include $(srctree)/$(src)/MALI_CONFIGURATION
MALI_PLATFORM = $(MALI_PLATFORM-$(TARGET_PLATFORM))
EXTRA_DEFINES += -DMALI_FAKE_PLATFORM_DEVICE=1
MALI_PLATFORM_FILES = $(subst $(src)/,,$(wildcard $(src)/platform/$(MALI_PLATFORM)/*.c))
MALI_PLATFORM_FILES = $(subst $(srctree)/$(src)/,,$(wildcard $(srctree)/$(src)/platform/$(MALI_PLATFORM)/*.c))
# End of MALI_SEC

# 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/*),)
ccflags-y += -I$(src)/linux/license/proprietary
ifeq ($(wildcard $(srctree)/$(src)/linux/license/gpl/*),)
ccflags-y += -I$(srctree)/$(src)/linux/license/proprietary
ifeq ($(CONFIG_MALI400_PROFILING),y)
$(error Profiling is incompatible with non-GPL license)
endif
Expand All @@ -59,7 +59,7 @@ ifeq ($(wildcard $(src)/linux/license/gpl/*),)
endif
$(error Linux Device integration is incompatible with non-GPL license)
else
ccflags-y += -I$(src)/linux/license/gpl
ccflags-y += -I$(srctree)/$(src)/linux/license/gpl
endif

mali-y += \
Expand Down Expand Up @@ -137,7 +137,7 @@ mali-$(CONFIG_MALI400_PROFILING) += linux/mali_ukk_profiling.o
mali-$(CONFIG_MALI400_PROFILING) += linux/mali_osk_profiling.o

mali-$(CONFIG_MALI400_INTERNAL_PROFILING) += linux/mali_profiling_internal.o timestamp-$(TIMESTAMP)/mali_timestamp.o
ccflags-$(CONFIG_MALI400_INTERNAL_PROFILING) += -I$(src)/timestamp-$(TIMESTAMP)
ccflags-$(CONFIG_MALI400_INTERNAL_PROFILING) += -I$(srctree)/$(src)/timestamp-$(TIMESTAMP)

mali-$(CONFIG_DMA_SHARED_BUFFER) += linux/mali_memory_dma_buf.o
mali-$(CONFIG_SYNC) += linux/mali_sync.o
Expand Down Expand Up @@ -167,18 +167,18 @@ ifeq ($(MALI_UPPER_HALF_SCHEDULING),1)
ccflags-y += -DMALI_UPPER_HALF_SCHEDULING
endif

ccflags-$(CONFIG_MALI400_UMP) += -I$(src)/../../ump/include/ump
ccflags-$(CONFIG_MALI400_UMP) += -I$(srctree)/$(src)/../../ump/include/ump
ccflags-$(CONFIG_MALI400_DEBUG) += -DDEBUG

# Use our defines when compiling
ccflags-y += -I$(src) -I$(src)/include -I$(src)/common -I$(src)/linux -I$(src)/platform
ccflags-y += -I$(srctree)/$(src) -I$(srctree)/$(src)/include -I$(srctree)/$(src)/common -I$(srctree)/$(src)/linux -I$(srctree)/$(src)/platform
# MALI_SEC
ccflags-y += -I$(src)/../ump/include -I$(src)/include/linux/mali -I$(src)/platform/$(MALI_PLATFORM)
ccflags-y += -I$(srctree)/$(src)/../ump/include -I$(srctree)/$(src)/include/linux/mali -I$(srctree)/$(src)/platform/$(MALI_PLATFORM)

# Get subversion revision number, fall back to only ${MALI_RELEASE_NAME} if no svn info is available
MALI_RELEASE_NAME=$(shell cat $(src)/.version 2> /dev/null)
MALI_RELEASE_NAME=$(shell cat $(srctree)/$(src)/.version 2> /dev/null)

SVN_INFO = (cd $(src); svn info 2>/dev/null)
SVN_INFO = (cd $(srctree)/$(src); svn info 2>/dev/null)

ifneq ($(shell $(SVN_INFO) 2>/dev/null),)
# SVN detected
Expand All @@ -189,13 +189,13 @@ CHANGED_REVISION := $(shell $(SVN_INFO) | grep '^Last Changed Rev: ' | cut -d: -
REPO_URL := $(shell $(SVN_INFO) | grep '^URL: ' | cut -d: -f2- | cut -b2-)

else # SVN
GIT_REV := $(shell cd $(src); git describe --always 2>/dev/null)
GIT_REV := $(shell cd $(srctree)/$(src); git describe --always 2>/dev/null)
ifneq ($(GIT_REV),)
# Git detected
DRIVER_REV := $(MALI_RELEASE_NAME)-$(GIT_REV)
CHANGE_DATE := $(shell cd $(src); git log -1 --format="%ci")
CHANGE_DATE := $(shell cd $(srctree)/$(src); git log -1 --format="%ci")
CHANGED_REVISION := $(GIT_REV)
REPO_URL := $(shell cd $(src); git describe --all --always 2>/dev/null)
REPO_URL := $(shell cd $(srctree)/$(src); git describe --all --always 2>/dev/null)

else # Git
# No Git or SVN detected
Expand All @@ -208,7 +208,7 @@ endif
ccflags-y += -DSVN_REV_STRING=\"$(DRIVER_REV)\"

VERSION_STRINGS :=
VERSION_STRINGS += API_VERSION=$(shell cd $(src); grep "\#define _MALI_API_VERSION" $(FILES_PREFIX)include/linux/mali/mali_utgard_uk_types.h | cut -d' ' -f 3 )
VERSION_STRINGS += API_VERSION=$(shell cd $(srctree)/$(src); grep "\#define _MALI_API_VERSION" $(FILES_PREFIX)include/linux/mali/mali_utgard_uk_types.h | cut -d' ' -f 3 )
VERSION_STRINGS += REPO_URL=$(REPO_URL)
VERSION_STRINGS += REVISION=$(DRIVER_REV)
VERSION_STRINGS += CHANGED_REVISION=$(CHANGED_REVISION)
Expand All @@ -231,5 +231,5 @@ VERSION_STRINGS += USING_POWER_PERFORMANCE_POLICY=$(CONFIG_POWER_PERFORMANCE_POL
VERSION_STRINGS += MALI_UPPER_HALF_SCHEDULING=$(MALI_UPPER_HALF_SCHEDULING)

# Create file with Mali driver configuration
$(src)/__malidrv_build_info.c:
@echo 'const char *__malidrv_build_info(void) { return "malidrv: $(VERSION_STRINGS)";}' > $(src)/__malidrv_build_info.c
$(srctree)/$(src)/__malidrv_build_info.c:
@echo 'const char *__malidrv_build_info(void) { return "malidrv: $(VERSION_STRINGS)";}' > $(srctree)/$(src)/__malidrv_build_info.c
12 changes: 6 additions & 6 deletions drivers/gud/gud-exynos3470/Makefile
Expand Up @@ -26,14 +26,14 @@ mcKernelApi-objs := MobiCoreKernelApi/main.o \
obj-$(CONFIG_SECURE_OS_CONTROL) += sec-os-ctrl/

# Release mode by default
ccflags-y := -DNDEBUG -include$(GUD_ROOT_FOLDER)/build_tag.h
ccflags-y := -DNDEBUG
ccflags-y += -include$(srctree)/$(GUD_ROOT_FOLDER)/build_tag.h
ccflags-y += -Wno-declaration-after-statement

ccflags-$(CONFIG_MOBICORE_DEBUG) += -DDEBUG
ccflags-$(CONFIG_MOBICORE_VERBOSE) += -DDEBUG_VERBOSE

# Choose one platform from the folder
MOBICORE_PLATFORM := $(shell (ls -1 $(GUD_ROOT_FOLDER)/MobiCoreDriver/platforms | tail -1) )
ifeq ($(MOBICORE_PLATFORM), ARM_VE_A9X4_QEMU)
ccflags-y += -DMC_NETLINK_COMPAT
endif
Expand All @@ -50,10 +50,10 @@ ifeq ($(MOBICORE_PLATFORM), EXYNOS_5430_STD)
ccflags-y += -DMC_NETLINK_COMPAT_V37
endif

# Use the available platform folder
ccflags-y += -I$(GUD_ROOT_FOLDER)/MobiCoreDriver/platforms/$(MOBICORE_PLATFORM)
# Include platform folder
ccflags-y += -I$(GUD_ROOT_FOLDER)/MobiCoreDriver/platforms/EXYNOS_3470_STD
# MobiCore Driver includes
ccflags-y += -I$(GUD_ROOT_FOLDER)/MobiCoreDriver/public
# MobiCore KernelApi required incldes
ccflags-y += -I$(GUD_ROOT_FOLDER)/MobiCoreKernelApi/include \
-I$(GUD_ROOT_FOLDER)/MobiCoreKernelApi/public
ccflags-y += -I$(GUD_ROOT_FOLDER)/MobiCoreKernelApi/include
ccflags-y += -I$(GUD_ROOT_FOLDER)/MobiCoreKernelApi/public
10 changes: 5 additions & 5 deletions firmware/Makefile
Expand Up @@ -143,14 +143,14 @@ fw-shipped-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin
fw-shipped-$(CONFIG_KEYBOARD_CYPRESS_TOUCH) += cypress/cypress_hl.fw
fw-shipped-$(CONFIG_EPEN_WACOM_G9PM) += epen/W9001_HL_EUR.bin

TSPFIRMWARE_DIRECTORY = firmware/tsp_atmel
TSPFIRMWARE_DIRECTORY = $(srctree)/firmware/tsp_atmel
ifeq ($(shell test -d $(TSPFIRMWARE_DIRECTORY) && echo yes),yes)
fw-shipped-$(CONFIG_TOUCHSCREEN_MXT540E) += tsp_atmel/mXT540E.fw
else
$(warning '$(TSPFIRMWARE_DIRECTORY)' directory dose not exist)
endif

TSPFIRMWARE_DIRECTORY_MEL_W = firmware/tsp_melfas/w
TSPFIRMWARE_DIRECTORY_MEL_W = $(srctree)/firmware/tsp_melfas/w
ifeq ($(shell test -d $(TSPFIRMWARE_DIRECTORY_MEL_W) && echo yes),yes)
fw-shipped-$(CONFIG_TOUCHSCREEN_MELFAS_W) += tsp_melfas/w/CORE.fw
fw-shipped-$(CONFIG_TOUCHSCREEN_MELFAS_W) += tsp_melfas/w/PRIV.fw
Expand All @@ -161,7 +161,7 @@ else
$(warning '$(TSPFIRMWARE_DIRECTORY)' directory dose not exist)
endif

TSPFIRMWARE_DIRECTORY_MEL_NOTE = firmware/tsp_melfas/note
TSPFIRMWARE_DIRECTORY_MEL_NOTE = $(srctree)/firmware/tsp_melfas/note
ifeq ($(shell test -d $(TSPFIRMWARE_DIRECTORY_MEL_NOTE) && echo yes),yes)
fw-shipped-$(CONFIG_TOUCHSCREEN_MELFAS_NOTE) += tsp_melfas/note/melfas.fw
fw-shipped-$(CONFIG_TOUCHSCREEN_MELFAS_NOTE) += tsp_melfas/note/BOOT.fw
Expand All @@ -172,14 +172,14 @@ else
$(warning '$(TSPFIRMWARE_DIRECTORY)' directory dose not exist)
endif

TSPFIRMWARE_DIRECTORY = firmware/tsp_stm
TSPFIRMWARE_DIRECTORY = $(srctree)/firmware/tsp_stm
ifeq ($(shell test -d $(TSPFIRMWARE_DIRECTORY) && echo yes),yes)
fw-shipped-$(CONFIG_TOUCHSCREEN_FTS) += tsp_stm/stm.fw
else
$(warning '$(TSPFIRMWARE_DIRECTORY)' directory dose not exist)
endif

TSPFIRMWARE_DIRECTORY = firmware/tsp_synaptics
TSPFIRMWARE_DIRECTORY = $(srctree)/firmware/tsp_synaptics
ifeq ($(shell test -d $(TSPFIRMWARE_DIRECTORY) && echo yes),yes)
fw-shipped-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI) += tsp_synaptics/synaptics_b0_h.fw \
tsp_synaptics/synaptics_b0_fac.fw
Expand Down

0 comments on commit 30d7fd5

Please sign in to comment.