Skip to content

Out of tree build fixes #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: release-4.4
Choose a base branch
from
Open

Out of tree build fixes #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
432a1c3
MALI: Fix out of source builds
kraj Sep 1, 2018
c76d381
net: wireless: rockchop_wlan: Fix out of source builds
kraj Sep 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions drivers/gpu/arm/mali400/mali/Kbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ MALI_PLATFORM ?= rk
# 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
ccflags-y += -I$(src)/linux/license/gpl
ccflags-y += -I$(srctree)/$(src)/linux/license/gpl


ifeq ($(USING_GPU_UTILIZATION), 1)
Expand All @@ -46,7 +46,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
Expand Down Expand Up @@ -219,7 +219,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 Down
6 changes: 3 additions & 3 deletions drivers/gpu/arm/mali400/ump/Kbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
CONFIG ?= default

# Link arch to the selected arch-config directory
$(shell [ -L $(src)/arch ] && rm $(src)/arch)
$(shell ln -sf arch-$(CONFIG) $(src)/arch)
$(shell touch $(src)/arch/config.h)
$(shell [ -L $(srctree)/$(src)/arch ] && rm $(srctree)/$(src)/arch)
$(shell ln -sf arch-$(CONFIG) $(srctree)/$(src)/arch)
$(shell touch $(srctree)/$(src)/arch/config.h)

UDD_FILE_PREFIX = ../mali/

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/rockchip_wlan/rtl8723ds/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ CONFIG_PLATFORM_RTL8197D = n

CONFIG_DRVEXT_MODULE = n

export TopDIR ?= $(shell pwd)/drivers/net/wireless/rockchip_wlan/rtl8723ds
export TopDIR ?= $(srctree)/drivers/net/wireless/rockchip_wlan/rtl8723ds

########### COMMON #################################
ifeq ($(CONFIG_GSPI_HCI), y)
Expand Down