Merge pull request #2450 from noreng-br/topic/update-imx-lib

imx-lib: Update metadata to match configurations with meta-imx

2 files changed, 3 insertions, 58 deletions

diff --git a/recipes-bsp/imx-lib/imx-lib/0001-Fix-gcc-15-errors.patch b/recipes-bsp/imx-lib/imx-lib/0001-Fix-gcc-15-errors.patch
deleted file mode 100644
index 964658fce..000000000
--- a/recipes-bsp/imx-lib/imx-lib/0001-Fix-gcc-15-errors.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 24e317b5cdc2b78735dfa7d4b2776b587b7a193f Mon Sep 17 00:00:00 2001
-From: Tom Hochstein <tom.hochstein@nxp.com>
-Date: Thu, 12 Jun 2025 13:15:28 -0500
-Subject: [PATCH] Fix gcc 15 errors
-
-Fixes HDMI and IPU headers c23 violations:
-```
-In file included from mxc_hdmi-cec.c:40:
-hdmi-cec.h:54:23: error: 'bool' cannot be defined via 'typedef'
-   54 | typedef unsigned char bool;
-      |                       ^~~~
-hdmi-cec.h:54:23: note: 'bool' is a keyword with '-std=c23' onwards
-hdmi-cec.h:54:1: warning: useless type name in empty declaration
-   54 | typedef unsigned char bool;
-      | ^~~~~~~
-```
-
-Upstream-Status: Submitted
-Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
----
- hdmi-cec/hdmi-cec.h | 2 --
- ipu/ipu.h           | 3 ---
- 2 files changed, 5 deletions(-)
-
-diff --git a/hdmi-cec/hdmi-cec.h b/hdmi-cec/hdmi-cec.h
-index 7d466c5..2b66208 100644
---- a/hdmi-cec/hdmi-cec.h
-+++ b/hdmi-cec/hdmi-cec.h
-@@ -51,8 +51,6 @@
- #define false  0
- #endif
- 
--typedef unsigned char bool;
--
- /*!
-  * Enumeration of device type.
-  */
-diff --git a/ipu/ipu.h b/ipu/ipu.h
-index 278385c..1a55875 100644
---- a/ipu/ipu.h
-+++ b/ipu/ipu.h
-@@ -30,9 +30,6 @@
- #ifdef __KERNEL__
- #include <linux/interrupt.h>
- #else
--#ifndef __cplusplus
--typedef unsigned char bool;
--#endif
- #define irqreturn_t int
- #define dma_addr_t int
- #define u32 unsigned int
--- 
-2.34.1
-
diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb
index 5cf1b5744..aeff089f7 100644
--- a/recipes-bsp/imx-lib/imx-lib_git.bb
+++ b/recipes-bsp/imx-lib/imx-lib_git.bb
@@ -12,10 +12,9 @@ PE = "1"
 
 PV = "5.9+${SRCPV}"
 
-SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH} \
-           file://0001-Fix-gcc-15-errors.patch"
-SRCBRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "8f124c3914d82019849fb697baeb730e4cb1b547"
+SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}"
+SRCBRANCH = "lf-6.12.49_2.2.0"
+SRCREV = "72cb12630d42b0efdc30b8e896d0546e69089916"
 
 inherit use-imx-headers