From e83f2c2f2f9d6ca4ffea4149fa0983b19c33cc15 Mon Sep 17 00:00:00 2001
From: Daiane Angolini <daiane.angolini@freescale.com>
Date: Fri, 20 Apr 2012 14:33:39 -0500
Subject: [PATCH] linux-imx: Add gpu module to imx6qsabrelite defconfig

Add a kernel patch to avoid unused variable error

Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
---
 .../linux-imx-2.6.38/imx6qsabrelite/defconfig |  4 +--
 ...nuset-but-set-variable-error-for-GPU.patch | 27 +++++++++++++++++++
 .../recipes-kernel/linux/linux-imx_2.6.38.bb  |  1 +
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 meta-fsl-arm/recipes-kernel/linux/linux-imx/linux-imx-avoid-unuset-but-set-variable-error-for-GPU.patch

diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.38/imx6qsabrelite/defconfig b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.38/imx6qsabrelite/defconfig
index a19bf9e6..b4c25b2c 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.38/imx6qsabrelite/defconfig
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.38/imx6qsabrelite/defconfig
@@ -282,7 +282,7 @@ CONFIG_IMX_HAVE_PLATFORM_IMX_VIIM=y
 CONFIG_IMX_HAVE_PLATFORM_PERFMON=y
 CONFIG_IMX_HAVE_PLATFORM_LDB=y
 CONFIG_IMX_HAVE_PLATFORM_IMX_SPDIF=y
-CONFIG_IMX_HAVE_PLATFORM_VIV_GPU=n
+CONFIG_IMX_HAVE_PLATFORM_VIV_GPU=y
 CONFIG_IMX_HAVE_PLATFORM_MXC_HDMI=y
 CONFIG_IMX_HAVE_PLATFORM_IMX_ANATOP_THERMAL=y
 CONFIG_IMX_HAVE_PLATFORM_FSL_OTG=y
@@ -2081,7 +2081,7 @@ CONFIG_MXC_MLB150=m
 #
 # MXC Vivante GPU support
 #
-CONFIG_MXC_GPU_VIV=n
+CONFIG_MXC_GPU_VIV=m
 
 #
 # ANATOP_THERMAL
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx/linux-imx-avoid-unuset-but-set-variable-error-for-GPU.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx/linux-imx-avoid-unuset-but-set-variable-error-for-GPU.patch
new file mode 100644
index 00000000..a8eb552c
--- /dev/null
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx/linux-imx-avoid-unuset-but-set-variable-error-for-GPU.patch
@@ -0,0 +1,27 @@
+From 0f2d5b37307b96156e35a20bb7e7585e437e11a7 Mon Sep 17 00:00:00 2001
+From: Daiane Angolini <daiane.angolini@freescale.com>
+Date: Fri, 20 Apr 2012 15:13:20 -0300
+Subject: [PATCH] linux-imx: avoid unuset but set variable error for GPU
+ driver
+
+Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
+---
+ drivers/mxc/gpu-viv/Kbuild |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/mxc/gpu-viv/Kbuild b/drivers/mxc/gpu-viv/Kbuild
+index aa1ec7b..35619fa 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
++EXTRA_CFLAGS += -Werror -Wno-unused-but-set-variable
+ 
+ OBJS := $(OS_KERNEL_DIR)/gc_hal_kernel_device.o \
+         $(OS_KERNEL_DIR)/gc_hal_kernel_driver.o \
+-- 
+1.7.5.4
+
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.38.bb b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.38.bb
index 92302ce7..f50dabd3 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.38.bb
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.38.bb
@@ -15,6 +15,7 @@ COMPATIBLE_MACHINE = "(imx53qsb|imx53ard|imx6qsabrelite)"
 SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git;tag=rel_imx_2.6.38_12.01.01 \
            file://egalax_ts-enable-single-event-support.patch \
            file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \
+           file://linux-imx-avoid-unuset-but-set-variable-error-for-GPU.patch \
            file://defconfig \
           "
 
-- 
2.40.1