From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 22 Sep 2015 22:20:04 +0000 (-0300)
Subject: kernel-module-imx-gpu-viv: Fix build against 3.14-based kernels - again
X-Git-Tag: 2.1~242
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=4742a2464624f1951531abb4c259bf293fbd34d7;p=meta-freescale.git

kernel-module-imx-gpu-viv: Fix build against 3.14-based kernels - again

The build fail about the bus frequency header (linux/busfreq-imx6.h)
not being found is caused by the mistaken check for the wrong kernel
version.

The regression has been introduced by d476c35
(kernel-module-imx-gpu-viv: Upgrade to 5.0.11.p7.1 for 3.14.38-6QP_ga
release) which has been not properly tested. This patch fixes it,
again, by adding back the removed patch.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/platform-Fix-kernel-version-check-for-3.14-based-ker.patch b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/platform-Fix-kernel-version-check-for-3.14-based-ker.patch
new file mode 100644
index 00000000..3dc06176
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/platform-Fix-kernel-version-check-for-3.14-based-ker.patch
@@ -0,0 +1,35 @@
+From 617bdbec386a1237e2a148989318cc4a1360788a Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio@ossystems.com.br>
+Date: Tue, 18 Aug 2015 23:08:48 +0000
+Subject: [PATCH] platform: Fix kernel version check for 3.14-based kernels
+Organization: O.S. Systems Software LTDA.
+
+The build fail about the bus frequency header (linux/busfreq-imx6.h)
+not being found is caused by the mistaken check for the wrong kernel
+version.
+
+This patch fixes it by adding the right kernel version to be checked.
+
+Upstream-Status: Pending
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ .../os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c b/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c
+index a2e72ff..241614a 100644
+--- a/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c
++++ b/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c
+@@ -40,7 +40,7 @@
+ #include <linux/pm_runtime.h>
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+ #include <mach/busfreq.h>
+-#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0)
+ #include <linux/busfreq-imx6.h>
+ #include <linux/reset.h>
+ #else
+-- 
+2.1.4
+
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p7.1.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p7.1.bb
index 8d316ffd..3218b4e5 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p7.1.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p7.1.bb
@@ -10,7 +10,7 @@ inherit module
 
 SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.tar.gz \
            file://updatemakefile.patch \
-           "
+           file://platform-Fix-kernel-version-check-for-3.14-based-ker.patch"
 
 SRC_URI[md5sum] = "a251a94390986371f75b338ad938e46f"
 SRC_URI[sha256sum] = "9aaef0a62bc2be69dc568228192b060c54970b5c700fee602d83a4d13e04a9b3"