gpu-viv: Build fix

For some yet-to-be-determined reason, EXTRA_CFLAGS is ignored
in the gpu-viv Kbuild files. Just add the needed flags to CC
for now.

Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>

1 files changed, 41 insertions, 41 deletions

diff --git a/drivers/mxc/gpu-viv/Kbuild b/drivers/mxc/gpu-viv/Kbuild
index aa1ec7bf5eb..eb761e00792 100644
--- a/drivers/mxc/gpu-viv/Kbuild
+++ b/drivers/mxc/gpu-viv/Kbuild
@@ -36,7 +36,7 @@ ARCH_KERNEL_DIR := arch/$(notdir $(AQARCH))/hal/kernel
 ARCH_VG_KERNEL_DIR := arch/$(notdir $(AQVGARCH))/hal/kernel
 HAL_KERNEL_DIR  := hal/kernel
 
-EXTRA_CFLAGS += -Werror
+CC += -Werror
 
 OBJS := $(OS_KERNEL_DIR)/gc_hal_kernel_device.o \
         $(OS_KERNEL_DIR)/gc_hal_kernel_driver.o \
@@ -101,112 +101,112 @@ install: all
 else
 
 
-EXTRA_CFLAGS += -DLINUX -DDRIVER
+CC += -DLINUX -DDRIVER
 
 ifeq ($(ENUM_WORKAROUND), 1)
-EXTRA_CFLAGS += -DENUM_WORKAROUND=1
+CC += -DENUM_WORKAROUND=1
 else
-EXTRA_CFLAGS += -DENUM_WORKAROUND=0
+CC += -DENUM_WORKAROUND=0
 endif
 
 ifeq ($(FLAREON),1)
-EXTRA_CFLAGS += -DFLAREON
+CC += -DFLAREON
 endif
 
 ifeq ($(DEBUG), 1)
-EXTRA_CFLAGS += -DDBG=1 -DDEBUG -D_DEBUG
+CC += -DDBG=1 -DDEBUG -D_DEBUG
 else
-EXTRA_CFLAGS += -DDBG=0
+CC += -DDBG=0
 endif
 
 ifeq ($(NO_DMA_COHERENT), 1)
-EXTRA_CFLAGS += -DNO_DMA_COHERENT
+CC += -DNO_DMA_COHERENT
 endif
 
 ifeq ($(CONFIG_DOVE_GPU), 1)
-EXTRA_CFLAGS += -DCONFIG_DOVE_GPU=1
+CC += -DCONFIG_DOVE_GPU=1
 endif
 
 ifeq ($(USE_POWER_MANAGEMENT), 1)
-EXTRA_CFLAGS += -DgcdPOWER_MANAGEMENT=1
+CC += -DgcdPOWER_MANAGEMENT=1
 else
-EXTRA_CFLAGS += -DgcdPOWER_MANAGEMENT=0
+CC += -DgcdPOWER_MANAGEMENT=0
 endif
 
 ifneq ($(USE_PLATFORM_DRIVER), 0)
-EXTRA_CFLAGS += -DUSE_PLATFORM_DRIVER=1
+CC += -DUSE_PLATFORM_DRIVER=1
 else
-EXTRA_CFLAGS += -DUSE_PLATFORM_DRIVER=0
+CC += -DUSE_PLATFORM_DRIVER=0
 endif
 
 ifeq ($(USE_PROFILER), 1)
-EXTRA_CFLAGS += -DVIVANTE_PROFILER=1
+CC += -DVIVANTE_PROFILER=1
 else
-EXTRA_CFLAGS += -DVIVANTE_PROFILER=0
+CC += -DVIVANTE_PROFILER=0
 endif
 
 ifeq ($(ANDROID), 1)
-EXTRA_CFLAGS += -DANDROID=1
+CC += -DANDROID=1
 endif
 
 ifeq ($(ENABLE_GPU_CLOCK_BY_DRIVER), 1)
-EXTRA_CFLAGS += -DENABLE_GPU_CLOCK_BY_DRIVER=1
+CC += -DENABLE_GPU_CLOCK_BY_DRIVER=1
 else
-EXTRA_CFLAGS += -DENABLE_GPU_CLOCK_BY_DRIVER=0
+CC += -DENABLE_GPU_CLOCK_BY_DRIVER=0
 endif
 
 ifeq ($(USE_NEW_LINUX_SIGNAL), 1)
-EXTRA_CFLAGS += -DUSE_NEW_LINUX_SIGNAL=1
+CC += -DUSE_NEW_LINUX_SIGNAL=1
 else
-EXTRA_CFLAGS += -DUSE_NEW_LINUX_SIGNAL=0
+CC += -DUSE_NEW_LINUX_SIGNAL=0
 endif
 
 ifeq ($(NO_USER_DIRECT_ACCESS_FROM_KERNEL), 1)
-EXTRA_CFLAGS += -DNO_USER_DIRECT_ACCESS_FROM_KERNEL=1
+CC += -DNO_USER_DIRECT_ACCESS_FROM_KERNEL=1
 else
-EXTRA_CFLAGS += -DNO_USER_DIRECT_ACCESS_FROM_KERNEL=0
+CC += -DNO_USER_DIRECT_ACCESS_FROM_KERNEL=0
 endif
 
 ifeq ($(FORCE_ALL_VIDEO_MEMORY_CACHED), 1)
-EXTRA_CFLAGS += -DgcdPAGED_MEMORY_CACHEABLE=1
+CC += -DgcdPAGED_MEMORY_CACHEABLE=1
 else
-EXTRA_CFLAGS += -DgcdPAGED_MEMORY_CACHEABLE=0
+CC += -DgcdPAGED_MEMORY_CACHEABLE=0
 endif
 
 ifeq ($(NONPAGED_MEMORY_CACHEABLE), 1)
-EXTRA_CFLAGS += -DgcdNONPAGED_MEMORY_CACHEABLE=1
+CC += -DgcdNONPAGED_MEMORY_CACHEABLE=1
 else
-EXTRA_CFLAGS += -DgcdNONPAGED_MEMORY_CACHEABLE=0
+CC += -DgcdNONPAGED_MEMORY_CACHEABLE=0
 endif
 
 ifeq ($(NONPAGED_MEMORY_BUFFERABLE), 1)
-EXTRA_CFLAGS += -DgcdNONPAGED_MEMORY_BUFFERABLE=1
+CC += -DgcdNONPAGED_MEMORY_BUFFERABLE=1
 else
-EXTRA_CFLAGS += -DgcdNONPAGED_MEMORY_BUFFERABLE=0
+CC += -DgcdNONPAGED_MEMORY_BUFFERABLE=0
 endif
 
 ifeq ($(CACHE_FUNCTION_UNIMPLEMENTED), 1)
-EXTRA_CFLAGS += -DgcdCACHE_FUNCTION_UNIMPLEMENTED=1
+CC += -DgcdCACHE_FUNCTION_UNIMPLEMENTED=1
 else
-EXTRA_CFLAGS += -DgcdCACHE_FUNCTION_UNIMPLEMENTED=0
+CC += -DgcdCACHE_FUNCTION_UNIMPLEMENTED=0
 endif
 
 ifeq ($(SUPPORT_SWAP_RECTANGLE), 1)
-EXTRA_CFLAGS += -DgcdSUPPORT_SWAP_RECTANGLE=1
+CC += -DgcdSUPPORT_SWAP_RECTANGLE=1
 else
-EXTRA_CFLAGS += -DgcdSUPPORT_SWAP_RECTANGLE=0
+CC += -DgcdSUPPORT_SWAP_RECTANGLE=0
 endif
 
 ifeq ($(VIVANTE_ENABLE_VG), 1)
-EXTRA_CFLAGS += -DgcdENABLE_VG=1
+CC += -DgcdENABLE_VG=1
 else
-EXTRA_CFLAGS += -DgcdENABLE_VG=0
+CC += -DgcdENABLE_VG=0
 endif
 
 ifeq ($(CONFIG_SMP), y)
-EXTRA_CFLAGS += -DgcdSMP=1
+CC += -DgcdSMP=1
 else
-EXTRA_CFLAGS += -DgcdSMP=0
+CC += -DgcdSMP=0
 endif
 
 ifeq ($(VIVANTE_NO_3D),1)
@@ -219,13 +219,13 @@ else
 EXTRA_CFLAGS += -DgcdENABLE_OUTER_CACHE_PATCH=0
 endif
 
-EXTRA_CFLAGS += -I$(AQROOT)/hal/kernel/inc
-EXTRA_CFLAGS += -I$(AQROOT)/hal/kernel
-EXTRA_CFLAGS += -I$(AQARCH)/hal/kernel
-EXTRA_CFLAGS += -I$(AQROOT)/hal/os/linux/kernel
+CC += -I$(AQROOT)/hal/kernel/inc
+CC += -I$(AQROOT)/hal/kernel
+CC += -I$(AQARCH)/hal/kernel
+CC += -I$(AQROOT)/hal/os/linux/kernel
 
 ifeq ($(VIVANTE_ENABLE_VG), 1)
-EXTRA_CFLAGS += -I$(AQVGARCH)/hal/kernel
+CC += -I$(AQVGARCH)/hal/kernel
 endif
 
 obj-$(CONFIG_MXC_GPU_VIV) += galcore.o