summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2011-05-31 09:25:24 +0100
committerAndy Green <andy.green@linaro.org>2011-05-31 11:06:55 +0100
commit2e44a9e473cc76357571a85ad0dd194a369f1673 (patch)
treea95285ac8fb9403dfccb87f5ae0acc4a605ad994
parent4670eee99ebbb34174e16af1089da2d11688808c (diff)
SGX differentiate between android kernel build
Signed-off-by: Andy Green <andy.green@linaro.org>
-rw-r--r--drivers/gpu/pvr/Makefile17
1 files changed, 12 insertions, 5 deletions
diff --git a/drivers/gpu/pvr/Makefile b/drivers/gpu/pvr/Makefile
index c4bc7ea188d..9b3cf75b9a6 100644
--- a/drivers/gpu/pvr/Makefile
+++ b/drivers/gpu/pvr/Makefile
@@ -1,7 +1,15 @@
#
-ccflags-y = -DLINUX -D__linux__ -Idrivers/gpu/pvr \
- -DANDROID \
- -DPVR_BUILD_DIR="\"omap_sgx_android\"" \
+ifeq ($(CONFIG_ANDROID),)
+ccflags-y = -DLINUX -D__linux__ \
+ -DPVR_BUILD_DIR="\"omap_sgx_linux\"" \
+ -DPVRSRV_MODNAME="\"pvrsrvkm"\"
+else
+ccflags-y = -DLINUX -D__linux__ \
+ -DPVR_BUILD_DIR="\"omap_sgx_android\"" \
+ -DPVRSRV_MODNAME="\"pvrsrvkm"\" \
+ -DANDROID
+endif
+ccflags-y += -Idrivers/gpu/pvr \
-DSGX_DYNAMIC_TIMING_INFO \
-DSYS_CUSTOM_POWERLOCK_WRAP \
-DSERVICES4 \
@@ -28,8 +36,7 @@ ccflags-y = -DLINUX -D__linux__ -Idrivers/gpu/pvr \
-DSUPPORT_SGX_NEW_STATUS_VALS \
-DSGX_EARLYSUSPEND \
-DPVR_NO_OMAP_TIMER \
- -DSUPPORT_SGX_LOW_LATENCY_SCHEDULING \
- -DPVRSRV_MODNAME="\"pvrsrvkm"\"
+ -DSUPPORT_SGX_LOW_LATENCY_SCHEDULING
ccflags-$(CONFIG_SGX540) += -Idrivers/gpu/pvr/omap4 -Idrivers/gpu/pvr/sgx \
-DSGX_CLK_CORE_DIV5 \