From 28d88005535248c686d49ee9f35dd924270d41a2 Mon Sep 17 00:00:00 2001 From: Daiane Angolini Date: Tue, 25 Jul 2023 13:31:06 -0300 Subject: linux-imx: Add patch to fix build issue Fix the warning (treated as error): ignal' due to enum/integer mismatch; have 'gceSTATUS(struct _gckOS *, void *)' {aka 'enum _gceSTATUS(struct _gckOS *, void *)'} [-Werror=enum-int-mismatch] | 5675 | _QuerySignal(IN gckOS Os, IN gctSIGNAL Signal) | | ^~~~~~~~~~~~ | In file included from /(...)tmp/work-shared/imx93-11x11-lpddr4x-evk/kernel-source/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:56: | /(...)/buildw/tmp/work-shared/imx93-11x11-lpddr4x-evk/kernel-source/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h:341:1: note: previous declaration of '_QuerySignal' with type 'gctBOOL(struct _gckOS *, void *)' {aka 'int(struct _gckOS *, void *)'} | 341 | _QuerySignal(IN gckOS Os, IN gctSIGNAL Signal); | | ^~~~~~~~~~~~ | cc1: all warnings being treated as errors Signed-off-by: Daiane Angolini --- ...mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch | 37 ++++++++++++++++++++++ recipes-kernel/linux/linux-imx_6.1.bb | 4 ++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 recipes-kernel/linux/linux-imx/drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch diff --git a/recipes-kernel/linux/linux-imx/drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch b/recipes-kernel/linux/linux-imx/drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch new file mode 100644 index 00000000..a917a243 --- /dev/null +++ b/recipes-kernel/linux/linux-imx/drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch @@ -0,0 +1,37 @@ +From 168e36d8879e3f5c4cf57ed74c10f6c134e45638 Mon Sep 17 00:00:00 2001 +From: Daiane Angolini +Date: Tue, 25 Jul 2023 10:54:45 -0300 +Subject: [PATCH] drivers:mxc-gpu-viv: Fix enum-int-mismatch warning + +Fix the warning (treated as error): + +ignal' due to enum/integer mismatch; have 'gceSTATUS(struct _gckOS *, void *)' {aka 'enum _gceSTATUS(struct _gckOS *, void *)'} [-Werror=enum-int-mismatch] +| 5675 | _QuerySignal(IN gckOS Os, IN gctSIGNAL Signal) +| | ^~~~~~~~~~~~ +| In file included from /(...)tmp/work-shared/imx93-11x11-lpddr4x-evk/kernel-source/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:56: +| /(...)/buildw/tmp/work-shared/imx93-11x11-lpddr4x-evk/kernel-source/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h:341:1: note: previous declaration of '_QuerySignal' with type 'gctBOOL(struct _gckOS *, void *)' {aka 'int(struct _gckOS *, void *)'} +| 341 | _QuerySignal(IN gckOS Os, IN gctSIGNAL Signal); +| | ^~~~~~~~~~~~ +| cc1: all warnings being treated as errors + +Signed-off-by: Daiane Angolini +--- + drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h +index 61edf03571443..b4c1cbf414846 100644 +--- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h ++++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h +@@ -337,7 +337,7 @@ _ConvertLogical2Physical(IN gckOS Os, + IN PLINUX_MDL Mdl, + OUT gctPHYS_ADDR_T *Physical); + +-gctBOOL ++gceSTATUS + _QuerySignal(IN gckOS Os, IN gctSIGNAL Signal); + + static inline gctINT +-- +2.34.1 + diff --git a/recipes-kernel/linux/linux-imx_6.1.bb b/recipes-kernel/linux/linux-imx_6.1.bb index 8b1e6045..574ba04d 100644 --- a/recipes-kernel/linux/linux-imx_6.1.bb +++ b/recipes-kernel/linux/linux-imx_6.1.bb @@ -12,7 +12,9 @@ i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU require recipes-kernel/linux/linux-imx.inc -SRC_URI += "file://ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch" +SRC_URI += "file://ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch \ + file://drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch \ + " SRCBRANCH = "lf-6.1.y" LOCALVERSION = "-6.1.22-2.0.0" -- cgit v1.2.3-54-g00ecf