26 files changed, 200 insertions, 30 deletions

diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index 1ab1d9df..c65bc9b9 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -21,6 +21,7 @@ KERNEL_DEVICETREE = " \
         nxp/imx/imx6qp-sabresd.dtb \
         nxp/imx/imx6qp-sabresd-hdcp.dtb \
         nxp/imx/imx6qp-sabresd-ldo.dtb \
+        nxp/imx/imx6qp-sabresd-pcie-ep.dtb \
         \
         nxp/imx/imx6q-sabresd-btwifi.dtb \
         nxp/imx/imx6q-sabresd.dtb \
@@ -28,12 +29,16 @@ KERNEL_DEVICETREE = " \
         nxp/imx/imx6q-sabresd-hdcp.dtb \
         nxp/imx/imx6q-sabresd-ldo.dtb \
         nxp/imx/imx6q-sabresd-uart.dtb \
+        nxp/imx/imx6q-sabresd-pcie.dtb \
+        nxp/imx/imx6q-sabresd-pcie-ep.dtb \
         \
         nxp/imx/imx6dl-sabresd-btwifi.dtb \
         nxp/imx/imx6dl-sabresd.dtb \
         nxp/imx/imx6dl-sabresd-enetirq.dtb \
         nxp/imx/imx6dl-sabresd-hdcp.dtb \
         nxp/imx/imx6dl-sabresd-ldo.dtb \
+        nxp/imx/imx6dl-sabresd-pcie.dtb \
+        nxp/imx/imx6dl-sabresd-pcie-ep.dtb \
 "
 KERNEL_DEVICETREE:use-mainline-bsp = " \
     nxp/imx/imx6qp-sabresd.dtb \
@@ -76,6 +81,6 @@ OPTEE_BIN_EXT = "6qsdb"
 
 SERIAL_CONSOLES = "115200;ttymxc0"
 
-MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k"
+MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k firmware-imx-epdc"
 
 MACHINE_FEATURES += " pci wifi bluetooth nxp8987-sdio"
diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index af196eab..df022d63 100644
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -34,5 +34,6 @@ OPTEE_BIN_EXT = "6slevk"
 SERIAL_CONSOLES = "115200;ttymxc0"
 
 MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
 
 MACHINE_FIRMWARE += "linux-firmware-ath6k firmware-imx-epdc"
diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf
index 858699c9..58fff6db 100644
--- a/conf/machine/imx6sllevk.conf
+++ b/conf/machine/imx6sllevk.conf
@@ -30,6 +30,7 @@ OPTEE_BIN_EXT:imx6sllevk = "6sllevk"
 SERIAL_CONSOLES = "115200;ttymxc0"
 
 MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
 
 # MESA DRI library
 XSERVER += "mesa-driver-swrast"
diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index 8d597c55..d85c7ce7 100644
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -45,3 +45,4 @@ SERIAL_CONSOLES = "115200;ttymxc0"
 MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k"
 
 MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index 10c7b6fb..3bab4f54 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -10,6 +10,7 @@ include conf/machine/include/imx-base.inc
 include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 
 MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
 
 KERNEL_DEVICETREE = " \
     nxp/imx/imx6ul-14x14-evk-btwifi.dtb \
@@ -26,7 +27,11 @@ KERNEL_DEVICETREE = " \
     nxp/imx/imx6ul-14x14-evk-reve-ecspi-slave.dtb \
     nxp/imx/imx6ul-14x14-evk-reve-emmc.dtb \
     nxp/imx/imx6ul-14x14-evk-reve-gpmi-weim.dtb \
+    nxp/imx/imx6ul-9x9-evk.dtb \
+    nxp/imx/imx6ul-9x9-evk-btwifi.dtb \
+    nxp/imx/imx6ul-9x9-evk-ldo.dtb \
 "
+
 KERNEL_DEVICETREE:use-mainline-bsp = "nxp/imx/imx6ul-14x14-evk.dtb"
 
 ### u-boot-fslc settings ###
diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf
index f412c18d..4c1184a7 100644
--- a/conf/machine/imx6ullevk.conf
+++ b/conf/machine/imx6ullevk.conf
@@ -9,13 +9,20 @@ MACHINEOVERRIDES =. "mx6ull:"
 include conf/machine/include/imx-base.inc
 include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 
+MACHINE_FIRMWARE:append = " firmware-imx-epdc"
+
 MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8801-sdio nxp8987-sdio"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
 
 KERNEL_DEVICETREE = " \
     nxp/imx/imx6ull-14x14-evk.dtb \
 "
 
 KERNEL_DEVICETREE:append:use-nxp-bsp = " \
+    nxp/imx/imx6ull-9x9-evk.dtb \
+    nxp/imx/imx6ull-9x9-evk-btwifi.dtb \
+    nxp/imx/imx6ull-9x9-evk-ldo.dtb \
+    nxp/imx/imx6ull-14x14-evk.dtb \
     nxp/imx/imx6ull-14x14-evk-btwifi.dtb \
     nxp/imx/imx6ull-14x14-evk-emmc.dtb \
     nxp/imx/imx6ull-14x14-evk-gpmi-weim.dtb \
diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf
index c5fd91bf..572434ae 100644
--- a/conf/machine/imx6ulz-14x14-evk.conf
+++ b/conf/machine/imx6ulz-14x14-evk.conf
@@ -10,6 +10,7 @@ include conf/machine/include/imx-base.inc
 include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 
 MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
 
 KERNEL_DEVICETREE = " \
     nxp/imx/imx6ulz-14x14-evk.dtb \
diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index 4b4a6012..96942ebb 100644
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -10,6 +10,7 @@ require conf/machine/include/imx-base.inc
 include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 
 MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
 
 KERNEL_DEVICETREE = "nxp/imx/imx7d-sdb.dtb"
 KERNEL_DEVICETREE:append:use-nxp-bsp = " \
@@ -42,3 +43,10 @@ UBOOT_CONFIG[epdc]     = "mx7dsabresd_epdc_config"
 OPTEE_BIN_EXT = "7dsdb"
 
 XSERVER += "mesa-driver-swrast"
+
+WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m4-demos"
+IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
+    mcore-demos/imx7d_sabresd_m4_TCM_Pingpang.bin \
+    mcore-demos/imx7d_sabresd_m4_TCM_helloworld.bin \
+    mcore-demos/imx7d_sabresd_m4_TCM_mcctty.bin \
+"
diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf
index 2e39a0c7..b5196e30 100644
--- a/conf/machine/imx7ulpevk.conf
+++ b/conf/machine/imx7ulpevk.conf
@@ -10,6 +10,7 @@ require conf/machine/include/imx-base.inc
 include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 
 MACHINE_FEATURES += "pci wifi bluetooth bcm43430 nxp8987-sdio"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
 
 KERNEL_DEVICETREE = " \
         nxp/imx/imx7ulp-evk.dtb \
@@ -43,3 +44,12 @@ OPTEE_BIN_EXT = "7ulp"
 
 # Set Serial console
 SERIAL_CONSOLES = "115200;ttyLP0"
+
+WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m4-demos"
+IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
+    mcore-demos/imx7ulp_m4_demo.img \
+    mcore-demos/imx7ulp_wireless_uart_bridge.img \
+    mcore-demos/imx7ulp_erpc_matrix_multiply_rpmsg_rtos_imxcm4.img \
+    mcore-demos/imx7ulp_rpmsg_lite_pingpong_rtos.img \
+    mcore-demos/imx7ulp_rpmsg_lite_str_echo_rtos.img \
+"
diff --git a/conf/machine/imx8mnul-ddr3l-evk.conf b/conf/machine/imx8mnul-ddr3l-evk.conf
index de00b6f6..7d87010b 100644
--- a/conf/machine/imx8mnul-ddr3l-evk.conf
+++ b/conf/machine/imx8mnul-ddr3l-evk.conf
@@ -14,7 +14,7 @@ MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356"
 # NXP BSP can consume proprietary jailhouse and Broadcom drivers
 # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
 # a full support for it yet.
-MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359"
+MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359 nxpwifi-all-sdio"
 
 KERNEL_DEVICETREE_BASENAME = "imx8mn-ddr3l-evk"
 KERNEL_DEVICETREE = " \
@@ -67,3 +67,11 @@ UBOOT_MAKE_TARGET:pn-u-boot-imx = ""
 IMX_BOOT_SEEK = "32"
 
 OPTEE_BIN_EXT = "8mnul"
+
+WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m7-demos"
+IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
+    mcore-demos/imx8mnddr3l_m7_TCM_hello_world.bin \
+    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 \
+"
diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf
index 92a436e5..ff56e386 100644
--- a/conf/machine/imx8mq-evk.conf
+++ b/conf/machine/imx8mq-evk.conf
@@ -15,7 +15,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc
 DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto"
 
 MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356 nxp8997-pcie nxp8997-sdio nxp9098-pcie nxp9098-sdio"
-MACHINE_FEATURES:append:use-nxp-bsp = " optee bcm4359"
+MACHINE_FEATURES:append:use-nxp-bsp = " optee bcm4359 jailhouse nxpwifi-all-pcie nxpwifi-all-sdio"
 
 MACHINE_SOCARCH_FILTER:append:mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d"
 
@@ -98,3 +98,10 @@ OPTEE_BIN_EXT = "8mq"
 
 # Add additional firmware
 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/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 \
+"
diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf
index 648320d8..56ede432 100644
--- a/conf/machine/imx8qm-mek.conf
+++ b/conf/machine/imx8qm-mek.conf
@@ -12,7 +12,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc
 IMX_DEFAULT_BSP = "nxp"
 
 MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie"
-MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359"
+MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359 nxpwifi-all-pcie nxpwifi-all-sdio"
 
 # Don't include kernels in standard images
 RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
@@ -42,7 +42,6 @@ KERNEL_DEVICETREE = " \
     freescale/imx8qm-mek-hdmi-rx-ov5640.dtb \
     freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \
     freescale/imx8qm-mek-jdi-wuxga-lvds1-panel-rpmsg.dtb \
-    freescale/imx8qm-mek-ov5640.dtb \
     freescale/imx8qm-mek-pcie-ep.dtb \
     freescale/imx8qm-mek-rpmsg.dtb \
     freescale/imx8qm-mek-sof.dtb \
@@ -50,6 +49,37 @@ KERNEL_DEVICETREE = " \
     freescale/imx8qm-mek-sof-wm8960.dtb \
     freescale/imx8qm-mek-usd-wifi.dtb \
     freescale/imx8qm-mek-usdhc3-m2.dtb \
+    freescale/imx8qm-mek-max9286-csi0.dtb \
+    freescale/imx8qm-mek-max9286-csi1.dtb \
+    freescale/imx8qm-mek-max9286-dual.dtb \
+    freescale/imx8qm-mek-revd-ca53.dtb \
+    freescale/imx8qm-mek-revd-ca72.dtb \
+    freescale/imx8qm-mek-revd-dsi-rm67191.dtb \
+    freescale/imx8qm-mek-revd-dsi-rm67199.dtb \
+    freescale/imx8qm-mek-revd.dtb \
+    freescale/imx8qm-mek-revd-enet2-tja1100.dtb \
+    freescale/imx8qm-mek-revd-hdmi.dtb \
+    freescale/imx8qm-mek-revd-jdi-wuxga-lvds1-panel.dtb \
+    freescale/imx8qm-mek-revd-jdi-wuxga-lvds1-panel-rpmsg.dtb \
+    freescale/imx8qm-mek-revd-max9286-csi0.dtb \
+    freescale/imx8qm-mek-revd-max9286-csi1.dtb \
+    freescale/imx8qm-mek-revd-max9286-dual.dtb \
+    freescale/imx8qm-mek-revd-ov5640-csi0.dtb \
+    freescale/imx8qm-mek-revd-ov5640-csi1.dtb \
+    freescale/imx8qm-mek-revd-ov5640-dual.dtb \
+    freescale/imx8qm-mek-revd-pcie-ep.dtb \
+    freescale/imx8qm-mek-revd-root.dtb \
+    freescale/imx8qm-mek-revd-rpmsg.dtb \
+    freescale/imx8qm-mek-revd-sof-cs42888.dtb \
+    freescale/imx8qm-mek-revd-sof-wm8962.dtb \
+    freescale/imx8qm-mek-revd-usdhc3-m2.dtb \
+    freescale/imx8qm-mek-revd-usd-wifi.dtb \
+    freescale/imx8qm-mek-ov5640-csi0.dtb \
+    freescale/imx8qm-mek-ov5640-csi0-rpmsg.dtb \
+    freescale/imx8qm-mek-ov5640-csi1.dtb \
+    freescale/imx8qm-mek-ov5640-csi1-rpmsg.dtb \
+    freescale/imx8qm-mek-ov5640-dual.dtb \
+    freescale/imx8qm-mek-ov5640-dual-rpmsg.dtb \
 "
 
 UBOOT_MAKE_TARGET = \
diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf
index 87df30f4..6763c985 100644
--- a/conf/machine/imx8qxp-mek.conf
+++ b/conf/machine/imx8qxp-mek.conf
@@ -25,6 +25,13 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-sof-cs42888.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8960.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8962.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-max9286.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-csi.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-csi-rpmsg.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-dual.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-dual-rpmsg.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-parallel.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-parallel-rpmsg.dtb \
 "
 
 UBOOT_CONFIG_BASENAME = "imx8qxp_mek"
diff --git a/conf/machine/imx8ulp-lpddr4-evk.conf b/conf/machine/imx8ulp-lpddr4-evk.conf
index 273e1569..ad8362e6 100644
--- a/conf/machine/imx8ulp-lpddr4-evk.conf
+++ b/conf/machine/imx8ulp-lpddr4-evk.conf
@@ -18,10 +18,13 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rk055hdmipi4m.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rk055hdmipi4mv2.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-sof-btsco.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-tpm.dtb \
 "
 
 UBOOT_CONFIG_BASENAME = "imx8ulp_evk"
 
-MACHINE_FEATURES += "soc-reva1"
+MACHINE_FEATURES += "soc-reva2"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
+
 UPOWER_FIRMWARE_NAME = "upower_a1.bin"
 IMX_DEFAULT_BSP = "nxp"
diff --git a/conf/machine/imx93-11x11-lpddr4x-evk.conf b/conf/machine/imx93-11x11-lpddr4x-evk.conf
index 001ce97a..e7ad6d4d 100644
--- a/conf/machine/imx93-11x11-lpddr4x-evk.conf
+++ b/conf/machine/imx93-11x11-lpddr4x-evk.conf
@@ -35,3 +35,13 @@ DDR_FIRMWARE_NAME = " \
     lpddr4_imem_1d_v202201.bin \
     lpddr4_imem_2d_v202201.bin \
 "
+
+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 \
+    mcore-demos/imx93-11x11-evk_m33_TCM_sai_low_power_audio.bin \
+"
+
diff --git a/conf/machine/imx93-14x14-lpddr4x-evk.conf b/conf/machine/imx93-14x14-lpddr4x-evk.conf
index 61aba723..57387a70 100644
--- a/conf/machine/imx93-14x14-lpddr4x-evk.conf
+++ b/conf/machine/imx93-14x14-lpddr4x-evk.conf
@@ -33,3 +33,10 @@ DDR_FIRMWARE_NAME = " \
 UBOOT_CONFIG[fspi]   = "${UBOOT_CONFIG_BASENAME}_defconfig"
 
 IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', '${IMXBOOT_TARGETS_BASENAME}', d)}"
+
+WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m33-demos"
+IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
+    mcore-demos/imx93-14x14-evk_m33_TCM_power_mode_switch.bin \
+    mcore-demos/imx93-14x14-evk_m33_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx93-14x14-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 5a4f1150..ef53da5e 100644
--- a/conf/machine/imx93-9x9-lpddr4-qsb.conf
+++ b/conf/machine/imx93-9x9-lpddr4-qsb.conf
@@ -29,3 +29,12 @@ DDR_FIRMWARE_NAME = " \
     lpddr4_imem_1d_v202201.bin \
     lpddr4_imem_2d_v202201.bin \
 "
+
+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/imx95-19x19-verdin.conf b/conf/machine/imx95-19x19-verdin.conf
index d03d6913..38acc47d 100644
--- a/conf/machine/imx95-19x19-verdin.conf
+++ b/conf/machine/imx95-19x19-verdin.conf
@@ -7,7 +7,6 @@
 MACHINEOVERRIDES =. "mx95:"
 
 require conf/machine/include/imx95-evk.inc
-IMX_DEFAULT_BSP = "nxp"
 
 KERNEL_DEVICETREE_BASENAME = "imx95-19x19-verdin"
 
@@ -17,6 +16,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-adv7535-ap1302.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ap1302.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ap1302.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lt8912.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lt8912.dtbo \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lt8912-ap1302.dtb \
@@ -25,18 +25,22 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lt9611uxc-ap1302.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20-combo.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20-isp-lt8912.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ox03c10.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ox03c10.dtbo \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ox03c10-isp-lt8912.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ox05b1s.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ox05b1s.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ox05b1s-combo.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ox05b1s-isp-lt8912.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ox05b1s-isp-lvds-dual.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-panel-cap-touch-10inch-dsi.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-panel-cap-touch-10inch-dsi.dtbo \
     freescale/${KERNEL_DEVICETREE_BASENAME}-panel-cap-touch-10inch-lvds.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rm692c9.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rm692c9.dtbo \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ti-serdes.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ti-serdes.dtbo \
@@ -50,17 +54,31 @@ UBOOT_CONFIG[fspi]  = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig"
 
 IMXBOOT_TARGETS = "flash_a55"
 
+IMXBOOT_TARGETS_BASENAME = "flash"
 OEI_BOARD  = "mx95lp5"
 DDR_TYPE   = "lpddr5"
 
+LPDDR_FW_VERSION = "_v202409"
 DDR_FIRMWARE_NAME = " \
-    lpddr5_dmem_v202311.bin \
-    lpddr5_dmem_qb_v202311.bin \
-    lpddr5_imem_v202311.bin \
-    lpddr5_imem_qb_v202311.bin \
+    lpddr5_dmem${LPDDR_FW_VERSION}.bin \
+    lpddr5_dmem_qb${LPDDR_FW_VERSION}.bin \
+    lpddr5_imem${LPDDR_FW_VERSION}.bin \
+    lpddr5_imem_qb${LPDDR_FW_VERSION}.bin \
 "
 
 IMXBOOT_VARIANT = ""
+M4_DEFAULT_IMAGE_MX95:imx-nxp-bsp = "imx95-verdin-evk_m7_TCM_power_mode_switch.bin"
+
+WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m7-demos"
+IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
+    mcore-demos/imx95-verdin-evk_m7_TCM_power_mode_switch.bin \
+    mcore-demos/imx95-verdin-evk_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+    mcore-demos/imx95-verdin-evk_m7_TCM_rpmsg_lite_str_echo_rtos.bin \
+    mcore-demos/imx95-verdin-evk_m7_TCM_sai_low_power_audio.bin \
+    ${@bb.utils.contains('COMBINED_FEATURES', 'xen', 'xen', '', d)} \
+"
+
+#IMXBOOT_VARIANT = ""
 
 # The System Manager Firmware Name corresponds to a particular binary implementation
 # in the Yocto deploy folder. The name is comprised of the Firmware Basename and the
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 28a79014..07d5a3e2 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -75,9 +75,9 @@ UBOOT_SUFFIX ?= "${UBOOT_SUFFIX:pn-${IMX_DEFAULT_BOOTLOADER}}"
 # wic based images.
 SPL_BINARY ??= "${@get_spl_binary(d)}"
 
-PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}"
-PREFERRED_PROVIDER_u-boot-mfgtool ??= "${IMX_DEFAULT_BOOTLOADER}"
 PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}"
+PREFERRED_PROVIDER_u-boot ??= "${PREFERRED_PROVIDER_virtual/bootloader}"
+PREFERRED_PROVIDER_u-boot-mfgtool ??= "${PREFERRED_PROVIDER_virtual/bootloader}"
 
 PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native"
 
@@ -538,13 +538,15 @@ PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.24.7.imx"
 
 # GStreamer copied recipes
 PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp              ??= "1.24.0.imx"
-PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp        ??= "1.24.0.imx"
+PREFERRED_VERSION_gst-examples:mx8-nxp-bsp              ??= "1.24.7.imx"
+PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp        ??= "1.24.7.imx"
 PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.24.0.imx"
 PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp       ??= "1.24.0.imx"
 PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp  ??= "1.24.0.imx"
 PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp        ??= "1.24.0.imx"
 PREFERRED_VERSION_gst-devtools:mx9-nxp-bsp              ??= "1.24.0.imx"
-PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp        ??= "1.24.0.imx"
+PREFERRED_VERSION_gst-examples:mx9-nxp-bsp              ??= "1.24.7.imx"
+PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp        ??= "1.24.7.imx"
 PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx9-nxp-bsp ??= "1.24.0.imx"
 PREFERRED_VERSION_gstreamer1.0-python:mx9-nxp-bsp       ??= "1.24.0.imx"
 PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx9-nxp-bsp  ??= "1.24.0.imx"
@@ -584,18 +586,18 @@ PREFERRED_PROVIDER_virtual/libg2d              ?= "imx-gpu-g2d"
 PREFERRED_PROVIDER_virtual/libg2d:imxdpu       ?= "imx-dpu-g2d"
 PREFERRED_PROVIDER_virtual/libg2d:mx93-nxp-bsp ?= "imx-pxp-g2d"
 
-PREFERRED_VERSION_weston:imx-nxp-bsp      ??= "12.0.4.imx"
+PREFERRED_VERSION_weston:imx-nxp-bsp      ??= "14.0.1.imx"
 # i.MX 6 & 7 stay on weston 10.0 for fbdev
 PREFERRED_VERSION_weston:mx6-nxp-bsp      ??= "10.0.5.imx"
 PREFERRED_VERSION_weston:mx7-nxp-bsp      ??= "10.0.5.imx"
 PREFERRED_VERSION_weston:imx-mainline-bsp   = ""
 
-PREFERRED_VERSION_wayland-protocols:imx-nxp-bsp  ??= "1.32.imx"
+PREFERRED_VERSION_wayland-protocols:imx-nxp-bsp  ??= "1.37.imx"
 
 PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.2.5.imx"
 
 # Use i.MX libdrm Version
-PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.116.imx"
+PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.123.imx"
 
 PREFERRED_VERSION_spirv-headers:imxvulkan            ??= "1.3.275.0.imx"
 PREFERRED_VERSION_spirv-tools:imxvulkan              ??= "1.3.275.0.imx"
@@ -617,8 +619,8 @@ PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx"
 PREFERRED_VERSION_opencv:mx9-nxp-bsp ??= "4.6.0.imx"
 
 # Handle default kernel
-IMX_DEFAULT_KERNEL:imx-mainline-bsp = "linux-fslc"
-IMX_DEFAULT_KERNEL:imx-nxp-bsp      = "linux-fslc-imx"
+IMX_DEFAULT_KERNEL:imx-mainline-bsp ??= "linux-fslc"
+IMX_DEFAULT_KERNEL:imx-nxp-bsp      ??= "linux-fslc-imx"
 
 PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"
 
diff --git a/conf/machine/include/imx8dxl-evk.inc b/conf/machine/include/imx8dxl-evk.inc
index 0f9aa1f0..4f5d1298 100644
--- a/conf/machine/include/imx8dxl-evk.inc
+++ b/conf/machine/include/imx8dxl-evk.inc
@@ -6,7 +6,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa35.inc
 IMX_DEFAULT_BSP = "nxp"
 
 MACHINE_FEATURES += "pci bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie"
-MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359"
+MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359 dpdk nxpwifi-all-sdio"
 
 # Don't include kernels in standard images
 RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index 442f4477..516dd8a9 100644
--- a/conf/machine/include/imx8mm-evk.inc
+++ b/conf/machine/include/imx8mm-evk.inc
@@ -16,7 +16,7 @@ MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356 nxp8987-sdio"
 # and pin it to NXP BSP only
 # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
 # a full support for it yet.
-MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359"
+MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359 dpdk nxpwifi-all-sdio"
 
 KERNEL_DEVICETREE = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
@@ -73,3 +73,13 @@ TEE_LOAD_ADDR = "0xbe000000"
 
 # Add additional firmware
 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 \
+"
diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc
index 11657bcc..a51f11ed 100644
--- a/conf/machine/include/imx8mn-evk.inc
+++ b/conf/machine/include/imx8mn-evk.inc
@@ -9,6 +9,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc
 DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto"
 
 MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356 nxp8987-sdio"
+MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
 
 # NXP BSP can consume proprietary jailhouse and Broadcom drivers
 # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
@@ -82,3 +83,11 @@ TEE_LOAD_ADDR = "0x56000000"
 
 # Add additional firmware
 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/imx8mn_m7_TCM_hello_world.bin \
+    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 \
+"
diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc
index 24e5588f..d6ae21d5 100644
--- a/conf/machine/include/imx8mp-evk.inc
+++ b/conf/machine/include/imx8mp-evk.inc
@@ -13,7 +13,7 @@ MACHINE_FEATURES += "pci wifi bluetooth nxp8997-pcie nxp8997-sdio nxp9098-pcie n
 # NXP BSP can consume proprietary jailhouse and Marvell drivers
 # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
 # a full support for it yet.
-MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse mrvl8997"
+MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse mrvl8997 nxpwifi-all-pcie nxpwifi-all-sdio dpdk"
 
 # Mainline kernel contains only one DTB file for
 # imx8mpevk machine
@@ -72,3 +72,12 @@ TEE_LOAD_ADDR = "0x56000000"
 
 # Add additional firmware
 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 \
+"
diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc
index adfcab47..e8308586 100644
--- a/conf/machine/include/imx8x-mek.inc
+++ b/conf/machine/include/imx8x-mek.inc
@@ -4,7 +4,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa35.inc
 IMX_DEFAULT_BSP = "nxp"
 
 MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie"
-MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359"
+MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359 nxpwifi-all-pcie nxpwifi-all-sdio"
 
 # Don't include kernels in standard images
 RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
@@ -33,8 +33,6 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds0-panel-rpmsg.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel-rpmsg.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-rpmsg.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
 "
 
diff --git a/conf/machine/include/imx93-evk.inc b/conf/machine/include/imx93-evk.inc
index 3a922282..8f5bb97f 100644
--- a/conf/machine/include/imx93-evk.inc
+++ b/conf/machine/include/imx93-evk.inc
@@ -4,7 +4,9 @@ require conf/machine/include/imx-base.inc
 require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc
 
 MACHINE_FEATURES += "pci wifi bluetooth"
-MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse nxpiw612-sdio"
+MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse nxpiw612-sdio dpdk nxpwifi-all-sdio"
+
+MACHINE_FIRMWARE:append:use-nxp-bsp = " ethos-u-firmware"
 
 KERNEL_DEVICETREE = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
diff --git a/conf/machine/include/imx95-evk.inc b/conf/machine/include/imx95-evk.inc
index 1a2d9f8a..d78745cf 100644
--- a/conf/machine/include/imx95-evk.inc
+++ b/conf/machine/include/imx95-evk.inc
@@ -28,19 +28,21 @@ OEI_SOC    = "mx95"
 OEI_BOARD  ?= "mx95lp5"
 DDR_TYPE   ?= "lpddr5"
 
-IMXBOOT_VARIANTS = "alt jailhouse netc"
+IMXBOOT_VARIANTS = "alt jailhouse netc sof"
 
 # Multiple system manager configs by IMXBOOT_VARIANT
 SYSTEM_MANAGER_CONFIG = "${@bb.utils.contains('IMXBOOT_VARIANT', 'alt',       'mx95alt', \
                             bb.utils.contains('IMXBOOT_VARIANT', 'jailhouse', 'mx95evkjailhouse', \
                             bb.utils.contains('IMXBOOT_VARIANT', 'netc',      'mx95netc', \
-                                                                              'mx95evk', d), d), d)}"
+                            bb.utils.contains('IMXBOOT_VARIANT', 'sof',       'mx95evksof', \
+                                                                              'mx95evk', d), d), d), d)}"
 
 # imx-boot (flash.bin) targets based on UBOOT_CONFIG and IMXBOOT_VARIANT
 IMXBOOT_TARGETS_SD = "${@bb.utils.contains('IMXBOOT_VARIANT', 'alt',       '${IMXBOOT_TARGETS_BASENAME}_alt', \
                          bb.utils.contains('IMXBOOT_VARIANT', 'jailhouse', '${IMXBOOT_TARGETS_BASENAME}_jailhouse', \
                          bb.utils.contains('IMXBOOT_VARIANT', 'netc',      '${IMXBOOT_TARGETS_BASENAME}_netc', \
-                                                                           '${IMXBOOT_TARGETS_BASENAME}_all ${IMXBOOT_TARGETS_BASENAME}_a55', d), d), d)} \
+                         bb.utils.contains('IMXBOOT_VARIANT', 'sof',       '${IMXBOOT_TARGETS_BASENAME}_a55', \
+                                                                           '${IMXBOOT_TARGETS_BASENAME}_all ${IMXBOOT_TARGETS_BASENAME}_a55', d), d), d), d)} \
 "
 
 IMXBOOT_TARGETS = " \