Merge pull request #2433 from nxp-upstream/Upstream-lf-6.12.49-2.2.0

Upstream packages base on lf 6.12.49 2.2.0

7 files changed, 20 insertions, 4 deletions

diff --git a/conf/machine/imx8mnul-ddr3l-evk.conf b/conf/machine/imx8mnul-ddr3l-evk.conf
index f0488912f..a481c48bc 100644
--- a/conf/machine/imx8mnul-ddr3l-evk.conf
+++ b/conf/machine/imx8mnul-ddr3l-evk.conf
@@ -72,4 +72,8 @@ IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
     mcore-demos/imx8mnddr3l_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
     mcore-demos/imx8mnddr3l_m7_TCM_rpmsg_lite_str_echo_rtos.bin \
     mcore-demos/imx8mnddr3l_m7_TCM_sai_low_power_audio.bin \
+    mcore-demos/imx8mnddr3l_m7_DDR_hello_world.bin \
+    mcore-demos/imx8mnddr3l_m7_DDR_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx8mnddr3l_m7_DDR_rpmsg_lite_str_echo_rtos.bin \
+    mcore-demos/imx8mnddr3l_m7_DDR_sai_low_power_audio.bin \
 "
diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf
index ff56e386d..796b7b9ef 100644
--- a/conf/machine/imx8mq-evk.conf
+++ b/conf/machine/imx8mq-evk.conf
@@ -104,4 +104,7 @@ IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
     mcore-demos/imx8mq_m4_TCM_hello_world.bin \
     mcore-demos/imx8mq_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
     mcore-demos/imx8mq_m4_TCM_rpmsg_lite_str_echo_rtos.bin \
+    mcore-demos/imx8mq_m4_DDR_hello_world.bin \
+    mcore-demos/imx8mq_m4_DDR_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx8mq_m4_DDR_rpmsg_lite_str_echo_rtos.bin \
 "
diff --git a/conf/machine/imx93-11x11-lpddr4x-evk.conf b/conf/machine/imx93-11x11-lpddr4x-evk.conf
index e7ad6d4d3..91ccb2e75 100644
--- a/conf/machine/imx93-11x11-lpddr4x-evk.conf
+++ b/conf/machine/imx93-11x11-lpddr4x-evk.conf
@@ -38,7 +38,6 @@ DDR_FIRMWARE_NAME = " \
 
 WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m33-demos"
 IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
-    mcore-demos/imx93-11x11-evk_m33_TCM_low_power_wakeword.bin \
     mcore-demos/imx93-11x11-evk_m33_TCM_power_mode_switch.bin \
     mcore-demos/imx93-11x11-evk_m33_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
     mcore-demos/imx93-11x11-evk_m33_TCM_rpmsg_lite_str_echo_rtos.bin \
diff --git a/conf/machine/imx93-9x9-lpddr4-qsb.conf b/conf/machine/imx93-9x9-lpddr4-qsb.conf
index ef53da5eb..97821284d 100644
--- a/conf/machine/imx93-9x9-lpddr4-qsb.conf
+++ b/conf/machine/imx93-9x9-lpddr4-qsb.conf
@@ -33,7 +33,6 @@ DDR_FIRMWARE_NAME = " \
 WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m33-demos"
 IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
     mcore-demos/imx93-9x9-qsb_m33_TCM_power_mode_switch.bin \
-    mcore-demos/imx93-9x9-qsb_m33_TCM_low_power_wakeword.bin \
     mcore-demos/imx93-9x9-qsb_m33_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
     mcore-demos/imx93-9x9-qsb_m33_TCM_rpmsg_lite_str_echo_rtos.bin \
     mcore-demos/imx93-9x9-qsb_m33_TCM_sai_low_power_audio.bin \
diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index 516dd8a9d..1a8b5b57a 100644
--- a/conf/machine/include/imx8mm-evk.inc
+++ b/conf/machine/include/imx8mm-evk.inc
@@ -77,9 +77,13 @@ MACHINE_FIRMWARE:append = " linux-firmware-ath10k"
 WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m4-demos"
 IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
     mcore-demos/imx8mm_m4_TCM_hello_world.bin \
-    mcore-demos/imx8mm_m4_TCM_low_power_wakeword.bin \
     mcore-demos/imx8mm_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
     mcore-demos/imx8mm_m4_TCM_rpmsg_lite_str_echo_rtos.bin \
     mcore-demos/imx8mm_m4_TCM_sai_low_power_audio.bin \
     mcore-demos/imx8mm_m4_TCM_sai_low_power_audio_wm8524.bin \
+    mcore-demos/imx8mm_m4_DDR_hello_world.bin \
+    mcore-demos/imx8mm_m4_DDR_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx8mm_m4_DDR_rpmsg_lite_str_echo_rtos.bin \
+    mcore-demos/imx8mm_m4_DDR_sai_low_power_audio.bin \
+    mcore-demos/imx8mm_m4_DDR_sai_low_power_audio_wm8524.bin \
 "
diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc
index a51f11edb..1f108f598 100644
--- a/conf/machine/include/imx8mn-evk.inc
+++ b/conf/machine/include/imx8mn-evk.inc
@@ -90,4 +90,8 @@ IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
     mcore-demos/imx8mn_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
     mcore-demos/imx8mn_m7_TCM_rpmsg_lite_str_echo_rtos.bin \
     mcore-demos/imx8mn_m7_TCM_sai_low_power_audio.bin \
+    mcore-demos/imx8mn_m7_DDR_hello_world.bin \
+    mcore-demos/imx8mn_m7_DDR_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx8mn_m7_DDR_rpmsg_lite_str_echo_rtos.bin \
+    mcore-demos/imx8mn_m7_DDR_sai_low_power_audio.bin \
 "
diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc
index d6ae21d55..f076233b7 100644
--- a/conf/machine/include/imx8mp-evk.inc
+++ b/conf/machine/include/imx8mp-evk.inc
@@ -76,8 +76,11 @@ MACHINE_FIRMWARE:append = " linux-firmware-ath10k"
 WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m7-demos"
 IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
     mcore-demos/imx8mp_m7_TCM_hello_world.bin \
-    mcore-demos/imx8mp_m7_TCM_low_power_wakeword.bin \
     mcore-demos/imx8mp_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
     mcore-demos/imx8mp_m7_TCM_rpmsg_lite_str_echo_rtos.bin \
     mcore-demos/imx8mp_m7_TCM_sai_low_power_audio.bin \
+    mcore-demos/imx8mp_m7_DDR_hello_world.bin \
+    mcore-demos/imx8mp_m7_DDR_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx8mp_m7_DDR_rpmsg_lite_str_echo_rtos.bin \
+    mcore-demos/imx8mp_m7_DDR_sai_low_power_audio.bin \
 "