summaryrefslogtreecommitdiffstats
path: root/recipes-kernel
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2016-05-16 11:54:29 -0500
committerOtavio Salvador <otavio@ossystems.com.br>2016-05-23 10:05:22 -0300
commitf6819c2beefd32bd84b4f554be0723319b72438d (patch)
tree5a29ff40965c794a565bb540528c6ee6ab0ed99d /recipes-kernel
parent75d56c51c4b7b907b828c589f1d1f857e97274b4 (diff)
downloadmeta-fsl-arm-f6819c2beefd32bd84b4f554be0723319b72438d.tar.gz
kernel-module-imx-gpu-viv: Fix gcc 6 build error -Werror=misleading-indentation
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/0001-Fix-gcc-6-build-error-Werror-misleading-indentation.patch30
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p8.3+fslc.bb3
2 files changed, 32 insertions, 1 deletions
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
index 0000000..75a1f56
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/0001-Fix-gcc-6-build-error-Werror-misleading-indentation.patch
@@ -0,0 +1,30 @@
1From 7e232c0ebb30cb4f99f941daaccb610df0a11cbe Mon Sep 17 00:00:00 2001
2From: Tom Hochstein <tom.hochstein@nxp.com>
3Date: Mon, 16 May 2016 11:30:35 -0500
4Subject: [PATCH] Fix gcc 6 build error -Werror=misleading-indentation
5
6Upstream-Status: Backport [internal release]
7
8Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
9---
10 .../linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --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
14index e436ada..f8d7233 100644
15--- a/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c
16+++ b/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c
17@@ -475,8 +475,8 @@ gckPLATFORM_AdjustParam(
18
19 Args->gpu3DMinClock = initgpu3DMinClock;
20
21- if(Args->physSize == 0)
22- Args->physSize = 0x80000000;
23+ if (Args->physSize == 0)
24+ Args->physSize = 0x80000000;
25
26 return gcvSTATUS_OK;
27 }
28--
291.9.1
30
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p8.3+fslc.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p8.3+fslc.bb
index 34cf5d2..af82a45 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p8.3+fslc.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p8.3+fslc.bb
@@ -10,7 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
10PV .= "+git${SRCPV}" 10PV .= "+git${SRCPV}"
11 11
12SRCREV = "c5473a84cfa44870a8016c7f684d46abcd36a018" 12SRCREV = "c5473a84cfa44870a8016c7f684d46abcd36a018"
13SRC_URI = "git://github.com/Freescale/kernel-module-imx-gpu-viv.git;protocol=https" 13SRC_URI = "git://github.com/Freescale/kernel-module-imx-gpu-viv.git;protocol=https \
14 file://0001-Fix-gcc-6-build-error-Werror-misleading-indentation.patch"
14 15
15S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
16 17