ceetm: Update to lf-6.12.49-2.2.0

Add patch to fix build error with gcc15
commit log :
46b3565 (HEAD -> master, tag: lf-6.18.y-1.0.0-tc1, tag: lf-6.18.2-1.0.0-rc1, tag: lf-6.12.49-2.2.0-rc2, tag: lf-6.12.49-2.2.0-rc1, tag: lf-6.12.49-2.2.0, tag: lf-6.12.34-2.1.0-rc2, tag: lf-6.12.34-2.1.0-rc1, tag: lf-6.12.34-2.1.0, tag: lf-6.12.3-1.0.0-rc3, tag: lf-6.12.3-1.0.0, tag: lf-6.12.20-2.0.0-rc2, tag: lf-6.12.20-2.0.0-rc1, tag: lf-6.12.20-2.0.0, origin/master, origin/jira/YOCIMX-8305, origin/HEAD) ceetm: replace print_rate() with tc_print_rate()
8c1ba25 ceetm: adjust all qdisc_util function pointers to match those in latest iproute2
e4423ad Only set CC in case it's not already set

Signed-off-by: Zelan Zou <zelan.zou@nxp.com>

3 files changed, 30 insertions, 73 deletions

diff --git a/recipes-kernel/ceetm/ceetm/0001-Makefile-Fix-build-error-with-gcc15-YOCIMX-8305.patch b/recipes-kernel/ceetm/ceetm/0001-Makefile-Fix-build-error-with-gcc15-YOCIMX-8305.patch
new file mode 100644
index 000000000..93b375eaa
--- /dev/null
+++ b/recipes-kernel/ceetm/ceetm/0001-Makefile-Fix-build-error-with-gcc15-YOCIMX-8305.patch
@@ -0,0 +1,28 @@
+From 9049175076c4d6706e6264f894680d5d1845e409 Mon Sep 17 00:00:00 2001
+From: Zelan Zou <zelan.zou@nxp.com>
+Date: Fri, 13 Sep 2024 04:22:13 +0200
+Subject: [PATCH] Makefile: Fix build error with gcc15 [YOCIMX-8305]
+
+Upstream-Status: Pending
+
+Signed-off-by: Zelan Zou <zelan.zou@nxp.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 9e55dad..60f8f7f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -8,7 +8,7 @@ LDFLAGS += -Wl,-export-dynamic
+ # if you are not using flex-builder. Download the iproute2 sources for the
+ # desired version and point to those instead.
+ ifneq ($(IPROUTE2_DIR),)
+-CFLAGS += -I$(IPROUTE2_DIR) -I$(IPROUTE2_DIR)/include -I$(IPROUTE2_DIR)/usr/include/ -I$(IPROUTE2_DIR)/usr/include/include
++CFLAGS += -I$(IPROUTE2_DIR) -I$(IPROUTE2_DIR)/include -I$(IPROUTE2_DIR)/usr/include/ -I$(IPROUTE2_DIR)/usr/include/include -Wno-error=incompatible-pointer-types
+ endif
+ 
+ MODDESTDIR := $(DESTDIR)/usr/lib/tc
+-- 
+2.25.1
+
diff --git a/recipes-kernel/ceetm/ceetm/0001-use-new-api-tc_print_rate.patch b/recipes-kernel/ceetm/ceetm/0001-use-new-api-tc_print_rate.patch
deleted file mode 100644
index bd077f8ac..000000000
--- a/recipes-kernel/ceetm/ceetm/0001-use-new-api-tc_print_rate.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 1eeee62be6f4f4c0564a1ebbf47b5d1ebd7ab282 Mon Sep 17 00:00:00 2001
-From: Ting Liu <ting.liu@nxp.com>
-Date: Thu, 15 Apr 2021 14:43:31 +0530
-Subject: [PATCH] use new api tc_print_rate
-
-Fix the build issue due to api change in iproute2:
-| dpaa1_ceetm.c:637:4: error: too few arguments to function 'print_rate'
-| print_rate(buf, sizeof(buf), qopt->rate);
-| ^~~~~~~~~~
-
-Upstream-Status: Pending
-
-Signed-off-by: Ting Liu <ting.liu@nxp.com>
----
- dpaa1_ceetm.c | 12 ++++--------
- dpaa2_ceetm.c |  6 ++----
- 2 files changed, 6 insertions(+), 12 deletions(-)
-
-diff --git a/dpaa1_ceetm.c b/dpaa1_ceetm.c
-index 15a2cd8..347e79a 100644
---- a/dpaa1_ceetm.c
-+++ b/dpaa1_ceetm.c
-@@ -634,11 +634,9 @@ int dpaa1_ceetm_print_qopt(struct qdisc_util *qu, FILE *f,
-                fprintf(f, "type root");
- 
-                if (qopt->shaped) {
--                       print_rate(buf, sizeof(buf), qopt->rate);
--                       fprintf(f, " shaped rate %s ", buf);
-+                       tc_print_rate(PRINT_FP, NULL, " shaped rate %s ", qopt->rate);
- 
--                       print_rate(buf, sizeof(buf), qopt->ceil);
--                       fprintf(f, "ceil %s ", buf);
-+                       tc_print_rate(PRINT_FP, NULL, "ceil %s ", qopt->ceil);
- 
-                        fprintf(f, "overhead %u ", qopt->overhead);
- 
-@@ -692,11 +690,9 @@ int dpaa1_ceetm_print_copt(struct qdisc_util *qu, FILE *f,
-                fprintf(f, "type root ");
- 
-                if (copt->shaped) {
--                       print_rate(buf, sizeof(buf), copt->rate);
--                       fprintf(f, "shaped rate %s ", buf);
-+                       tc_print_rate(PRINT_FP, NULL, "shaped rate %s ", copt->rate);
- 
--                       print_rate(buf, sizeof(buf), copt->ceil);
--                       fprintf(f, "ceil %s ", buf);
-+                       tc_print_rate(PRINT_FP, NULL, "ceil %s ", copt->ceil);
- 
-                } else {
-                        fprintf(f, "unshaped tbl %d", copt->tbl);
-diff --git a/dpaa2_ceetm.c b/dpaa2_ceetm.c
-index 6b1b033..0505046 100644
---- a/dpaa2_ceetm.c
-+++ b/dpaa2_ceetm.c
-@@ -516,11 +516,9 @@ int dpaa2_ceetm_print_copt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
-                fprintf(f, "type root ");
- 
-                if (copt->shaped) {
--                       print_rate(buf, sizeof(buf), copt->shaping_cfg.cir);
--                       fprintf(f, "CIR %s ", buf);
-+                       tc_print_rate(PRINT_FP, NULL, "CIR %s ", copt->shaping_cfg.cir);
- 
--                       print_rate(buf, sizeof(buf), copt->shaping_cfg.eir);
--                       fprintf(f, "EIR %s ", buf);
-+                       tc_print_rate(PRINT_FP, NULL, "EIR %s ", copt->shaping_cfg.eir);
- 
-                        fprintf(f, "CBS %d EBS %d ", copt->shaping_cfg.cbs, copt->shaping_cfg.ebs);
- 
--- 
-2.25.1
-
diff --git a/recipes-kernel/ceetm/ceetm_git.bb b/recipes-kernel/ceetm/ceetm_git.bb
index 947a31280..2356b8db4 100644
--- a/recipes-kernel/ceetm/ceetm_git.bb
+++ b/recipes-kernel/ceetm/ceetm_git.bb
@@ -3,9 +3,9 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://github.com/nxp-qoriq/ceetm;protocol=https;nobranch=1"
-SRCREV = "27218bc625e83458db2301f6c07de133cb5f6792"
+SRCREV = "46b3565a48ca20f90ad601cef8250cdd35f18b22"
 SRC_URI:append = " file://0001-Makefile-update-CFLAGS.patch \
-    file://0001-use-new-api-tc_print_rate.patch \
+                   file://0001-Makefile-Fix-build-error-with-gcc15-YOCIMX-8305.patch \
 "
 DEPENDS = "iproute2"