From 68372fcd2a4f9dbfe13e10b6b25a134ba3c7bea7 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 18 Aug 2015 20:37:22 -0300 Subject: [PATCH] kernel-module-imx-gpu-viv: Fix build against 3.14-based kernels 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. Signed-off-by: Otavio Salvador --- ...nel-version-check-for-3.14-based-ker.patch | 35 +++++++++++++++++++ .../kernel-module-imx-gpu-viv_5.0.11.p6.3.bb | 3 +- 2 files changed, 37 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 00000000..3b92ac8c --- /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 +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 +--- + .../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 + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) + #include +-#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0) + #include + #include + #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 db9dcbbe..a27decda 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.40.1