Sync master with scarthgap (backports)

dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc/0001-FMCCFGReader-improve-parameter-definition-of-functio.patch

@@ -1,7 +1,7 @@
-From 329c8ab2770ab34d887296a35585fac53c8bedb7 Mon Sep 17 00:00:00 2001
+From 018249d180705657efbecdce3736c9a415412762 Mon Sep 17 00:00:00 2001
 From: Meng Li <[email protected]>
-Date: Wed, 5 Jun 2024 18:54:22 +0800
-Subject: [PATCH] FMCCFGReader: improve parameter definition of function
+Date: Tue, 9 Jul 2024 14:35:06 +0800
+Subject: [PATCH] FMCCFGReader: improve parameter definition of function 
  errorFuncHandler
 
 When building fmc package, there is below error:
@@ -30,27 +30,27 @@ index a1a87a4..c11742c 100644
 --- a/source/FMCGenericError.cpp
 +++ b/source/FMCGenericError.cpp
 @@ -33,7 +33,7 @@
- #include "FMCUtils.h"
- #include "logger.hpp"
-
--void errorFuncHandler( void * ctx, xmlErrorPtr error )
-+void errorFuncHandler( void * ctx, const xmlError *error )
- {
-     char *filestr = (char*)"";
-     char *msgstr  = (char*)"";
+ #include "FMCUtils.h"
+ #include "logger.hpp"
+ 
+-void errorFuncHandler( void * ctx, xmlErrorPtr error )
++void errorFuncHandler( void * ctx, const xmlError *error )
+ {
+     char *filestr = (char*)"";
+     char *msgstr  = (char*)"";
 diff --git a/source/FMCGenericError.h b/source/FMCGenericError.h
 index 504a81b..61ab6c1 100644
 --- a/source/FMCGenericError.h
 +++ b/source/FMCGenericError.h
 @@ -35,7 +35,7 @@
-
- const int NO_LINE = -1;
-
--void errorFuncHandler( void * ctx, xmlErrorPtr error );
-+void errorFuncHandler( void * ctx, const xmlError *error );
-
-
- class CGenericError {
+ 
+ const int NO_LINE = -1;
+ 
+-void errorFuncHandler( void * ctx, xmlErrorPtr error );
++void errorFuncHandler( void * ctx, const xmlError *error );
+ 
+ 
+ class CGenericError {
 -- 
 2.34.1
 

recipes-bsp/imx-oei/imx-oei_1.0.0.bb

@@ -0,0 +1,57 @@
+SUMMARY = "i.MX Optional Execution Image"
+
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = "gcc-arm-none-eabi-native"
+
+SRC_URI = "${IMX_OEI_SRC};branch=${SRCBRANCH}"
+IMX_OEI_SRC ?= "git://github.com/nxp-imx/imx-oei.git;protocol=https"
+SRCBRANCH = "master"
+SRCREV = "1a572a640ef8d6883e8ca39744cd6d2d5dbed678"
+
+S = "${WORKDIR}/git"
+
+inherit deploy
+
+OEI_CONFIGS ?= "UNDEFINED"
+OEI_CORE    ?= "UNDEFINED"
+OEI_SOC     ?= "UNDEFINED"
+OEI_BOARD   ?= "UNDEFINED"
+
+LDFLAGS[unexport] = "1"
+
+EXTRA_OEMAKE = "\
+    board=${OEI_BOARD} \
+    DEBUG=1 \
+    OEI_CROSS_COMPILE=arm-none-eabi-"
+
+do_configure() {
+    for oei_config in ${OEI_CONFIGS}; do
+        oe_runmake clean oei=$oei_config
+    done
+}
+
+do_compile() {
+    for oei_config in ${OEI_CONFIGS}; do
+        oe_runmake oei=$oei_config
+    done
+}
+
+do_install() {
+    install -d ${D}/firmware
+    for oei_config in ${OEI_CONFIGS}; do
+        install -m 0644 ${B}/build/${OEI_BOARD}/$oei_config/oei-*.bin ${D}/firmware
+    done
+}
+
+addtask deploy after do_install
+do_deploy() {
+    cp -rf ${D}/firmware/* ${DEPLOYDIR}/
+}
+
+FILES:${PN} = "/firmware"
+SYSROOT_DIRS += "/firmware"
+
+COMPATIBLE_MACHINE = "(mx95-generic-bsp)"

recipes-core/udev/udev-rules-imx.bb

@@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 SRC_URI = " file://10-imx.rules"
 
 do_install () {
-	install -d ${D}${sysconfdir}/udev/rules.d
-	install -m 0644 ${WORKDIR}/10-imx.rules ${D}${sysconfdir}/udev/rules.d/
+    install -D -m 0644 ${WORKDIR}/10-imx.rules \
+                       ${D}${sysconfdir}/udev/rules.d/10-imx.rules
 }

recipes-multimedia/alsa/imx-alsa-plugins_git.bb

@@ -20,7 +20,7 @@ inherit autotools pkgconfig use-imx-headers
 PV = "1.0.26+${SRCPV}"
 
 SRC_URI = "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "MM_04.08.03_2312_L6.6.y"
+SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
 SRCREV = "b2ba082e70333f187972ee4e85f63f9d2f608331"
 
 S = "${WORKDIR}/git"