From d27ebc5819efc6b3a2379d14b8eda02c634c7e36 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 16 May 2016 11:54:29 -0500 Subject: [PATCH] kernel-module-imx-gpu-viv: Fix gcc 6 build error -Werror=misleading-indentation Signed-off-by: Tom Hochstein Signed-off-by: Otavio Salvador --- ...-error-Werror-misleading-indentation.patch | 30 +++++++++++++++++++ ...nel-module-imx-gpu-viv_5.0.11.p8.3+fslc.bb | 3 +- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/0001-Fix-gcc-6-build-error-Werror-misleading-indentation.patch 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 00000000..75a1f562 --- /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 @@ +From 7e232c0ebb30cb4f99f941daaccb610df0a11cbe Mon Sep 17 00:00:00 2001 +From: Tom Hochstein +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 +--- + .../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 + 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 34cf5d23..af82a453 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" 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" -- 2.40.1