diff --git a/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/0002-Use-busfreq-imx6.h-up-to-3.15-kernel.patch b/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/0002-Use-busfreq-imx6.h-up-to-3.15-kernel.patch new file mode 100644 index 000000000..19fb57e55 --- /dev/null +++ b/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/0002-Use-busfreq-imx6.h-up-to-3.15-kernel.patch @@ -0,0 +1,27 @@ +From 07ca37302306e764adaeaa8f2a8e4ef1b40cd395 Mon Sep 17 00:00:00 2001 +From: Hector Palacios +Date: Tue, 1 Dec 2015 11:36:24 +0100 +Subject: [PATCH] Use busfreq-imx6.h up to 3.15 kernel + +For CC6 we're using Freescale 3.14.28 BSP. Even though we apply stability +patches that move the kernel version beyond 3.14.29 we still want to use +the GPU vivante external module build with the original BSP. + +Signed-off-by: Hector Palacios +--- + .../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 a12579d44723..8f7bb281aa74 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 +@@ -74,7 +74,7 @@ + #include + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) + #include +-#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 29) ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0) + #include + #include + #else diff --git a/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_%.bbappend b/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_%.bbappend index 8bb0d42c1..7e4262858 100644 --- a/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_%.bbappend +++ b/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_%.bbappend @@ -2,4 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" -SRC_URI += "file://0001-mxc-gpu-use-recommended-values-for-minimum-GPU-frequ.patch" +SRC_URI += " \ + file://0001-mxc-gpu-use-recommended-values-for-minimum-GPU-frequ.patch \ + file://0002-Use-busfreq-imx6.h-up-to-3.15-kernel.patch \ +"