[meta-freescale] [meta-fsl-arm][PATCH 5/5] kernel-module-imx-gpu-viv: Fix build against 3.14-based kernels

[Daiane Angolini]

On Wed, Aug 19, 2015 at 6:26 AM, Otavio Salvador
<otavio at ossystems.com.br> wrote:
> The bus frequency header was not being found as the check for the
> kernel version was wrong.

I'm not sure I understand this commit log. Can you, please, try to elaborate?

Maybe mention <linux/busfreq-imx6.h> would help:

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.

Daiane

>
> Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
> ---
>  ...x-kernel-version-check-for-3.14-based-ker.patch | 29 ++++++++++++++++++++++
>  .../kernel-module-imx-gpu-viv_5.0.11.p6.3.bb       |  3 ++-
>  2 files changed, 31 insertions(+), 1 deletion(-)
>  create mode 100644 recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/platform-Fix-kernel-version-check-for-3.14-based-ker.patch
>
> 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 0000000..ba2e0b3
> --- /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,29 @@
> +From 617bdbec386a1237e2a148989318cc4a1360788a Mon Sep 17 00:00:00 2001
> +From: Otavio Salvador <otavio at 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.
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Otavio Salvador <otavio at 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/imx-gpu-viv-kernel-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c b/imx-gpu-viv-kernel-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c
> +index a2e72ff..241614a 100644
> +--- a/imx-gpu-viv-kernel-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c
> ++++ b/imx-gpu-viv-kernel-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.p6.3.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p6.3.bb
> index db9dcbb..a27decd 100644
> --- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p6.3.bb
> +++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p6.3.bb
> @@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
>
>  inherit module
>
> -SRC_URI = "${FSL_MIRROR}/imx-gpu-viv-kernel-${@'${PV}'.replace('5.0.11.p6.3', '5.0.11.p6.3-beta')}.tar.gz"
> +SRC_URI = "${FSL_MIRROR}/imx-gpu-viv-kernel-${@'${PV}'.replace('5.0.11.p6.3', '5.0.11.p6.3-beta')}.tar.gz \
> +           file://platform-Fix-kernel-version-check-for-3.14-based-ker.patch"
>
>  SRC_URI[md5sum] = "6d46da80de94e98ee68ab1a75f384b89"
>  SRC_URI[sha256sum] = "e4b02fc0c9bdbfc7ecc67a0bad0917e788921c8f2444d99bd77daae7f3cd95df"
> --
> 2.5.0
>
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale