]> code.ossystems Code Review - meta-freescale.git/commitdiff
kernel-module-imx-gpu-viv: Fix gcc 6 build error -Werror=misleading-indentation
authorTom Hochstein <tom.hochstein@nxp.com>
Mon, 16 May 2016 16:54:29 +0000 (11:54 -0500)
committerOtavio Salvador <otavio@ossystems.com.br>
Thu, 2 Jun 2016 18:22:35 +0000 (15:22 -0300)
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/0001-Fix-gcc-6-build-error-Werror-misleading-indentation.patch [new file with mode: 0644]
recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p8.3+fslc.bb

diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/0001-Fix-gcc-6-build-error-Werror-misleading-indentation.patch b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/0001-Fix-gcc-6-build-error-Werror-misleading-indentation.patch
new file mode 100644 (file)
index 0000000..75a1f56
--- /dev/null
@@ -0,0 +1,30 @@
+From 7e232c0ebb30cb4f99f941daaccb610df0a11cbe Mon Sep 17 00:00:00 2001
+From: Tom Hochstein <tom.hochstein@nxp.com>
+Date: Mon, 16 May 2016 11:30:35 -0500
+Subject: [PATCH] Fix gcc 6 build error -Werror=misleading-indentation
+
+Upstream-Status: Backport [internal release]
+
+Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
+---
+ .../linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c  | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+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 e436ada..f8d7233 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
+@@ -475,8 +475,8 @@ gckPLATFORM_AdjustParam(
+     Args->gpu3DMinClock = initgpu3DMinClock;
+-  if(Args->physSize == 0)
+-    Args->physSize = 0x80000000;
++    if (Args->physSize == 0)
++        Args->physSize = 0x80000000;
+     return gcvSTATUS_OK;
+ }
+-- 
+1.9.1
+
index 34cf5d236a6933af80260d6ca077b76679c65aee..af82a4532d0403e49a2339b63014d059da1041eb 100644 (file)
@@ -10,7 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
 PV .= "+git${SRCPV}"
 
 SRCREV = "c5473a84cfa44870a8016c7f684d46abcd36a018"
-SRC_URI = "git://github.com/Freescale/kernel-module-imx-gpu-viv.git;protocol=https"
+SRC_URI = "git://github.com/Freescale/kernel-module-imx-gpu-viv.git;protocol=https \
+           file://0001-Fix-gcc-6-build-error-Werror-misleading-indentation.patch"
 
 S = "${WORKDIR}/git"