9 files changed, 31 insertions, 46 deletions

diff --git a/recipes-fsl/mcore-demos/README b/recipes-fsl/mcore-demos/README
index 0c9944873..addd1c376 100644
--- a/recipes-fsl/mcore-demos/README
+++ b/recipes-fsl/mcore-demos/README
@@ -4,7 +4,8 @@ The M4 demo app version of each SoCs are followed:
 * 1.0.1 -- i.MX 7D
 
 The M7 demo app version of each SoCs are followed:
-* 2.16.000 --  i.MX 8MP , 8MNULite, 8MN, i.MX95
+* 2.16.000 --  i.MX 8MP , 8MNULite, 8MN
+* 24.12.00 --  i.MX95
 
 The M33 demo app version of each SoCs are followed:
 * 2.16.000 --  i.MX 8ULP, i.MX 93
diff --git a/recipes-fsl/mcore-demos/imx-m33-demos_2.16.000.bb b/recipes-fsl/mcore-demos/imx-m33-demos_2.16.000.bb
index 430182ae3..e1d303e3d 100644
--- a/recipes-fsl/mcore-demos/imx-m33-demos_2.16.000.bb
+++ b/recipes-fsl/mcore-demos/imx-m33-demos_2.16.000.bb
@@ -6,10 +6,8 @@ require imx-mcore-demos.inc
 LIC_FILES_CHKSUM:mx8ulp-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
 LIC_FILES_CHKSUM:mx93-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
 
-SRC_URI[imx8ulp.md5sum] = "9db44ac8ae50c2ce37072c89d54bf794"
 SRC_URI[imx8ulp.sha256sum] = "2d1d48eb3f01d020917f42281581835a3c085233e9764ec845940c1e49ac317b"
 
-SRC_URI[imx93.md5sum] = "293b097136b5c2c857057d1724b468ac"
 SRC_URI[imx93.sha256sum] = "c954b9bc32cfdea9b696fa0b02f934812054e3ab445b5dd8eb7898d427e47526"
 
 COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx93-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb b/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb
index fd99c6370..489e6f8a9 100644
--- a/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb
+++ b/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb
@@ -1,28 +1,13 @@
-SUMMARY = "i.MX M4 core Demo images"
-SECTION = "app"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM:mx7d-nxp-bsp = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a"
+# Copyright 2017-2021 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
 
-inherit deploy fsl-eula-unpack
+require imx-mcore-demos.inc
 
-M4_SOC ?= "INVALID"
-M4_SOC:mx7d-nxp-bsp = "imx7d-sabresd"
+LIC_FILES_CHKSUM:mx7d-nxp-bsp = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a"
 
-SRC_URI = "${FSL_MIRROR}/${M4_SOC}-m4-freertos-${PV}.bin;fsl-eula=true"
-S = "${WORKDIR}/${M4_SOC}-m4-freertos-${PV}"
+SRC_URI = "${FSL_MIRROR}/${SOC}-m4-freertos-${PV}.bin;fsl-eula=true"
+S = "${UNPACKDIR}/${SOC}-m4-freertos-${PV}"
 
-SRC_URI[md5sum] = "b05b780ff3916f4953ab58ac95233c38"
 SRC_URI[sha256sum] = "cc00d3b936d49b2794a2a99e10129437e70caba3fd26b8379b8c50dd22f73254"
 
-do_deploy () {
-   # Install the demo binaries
-   install -d ${DEPLOYDIR}
-   cp ${S}/*.bin ${DEPLOYDIR}/
-   ls ${DEPLOYDIR}/
-}
-
-addtask deploy before do_build after do_compile
-
-PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 COMPATIBLE_MACHINE = "(mx7d-nxp-bsp)"
-
diff --git a/recipes-fsl/mcore-demos/imx-m4-demos_2.16.000.bb b/recipes-fsl/mcore-demos/imx-m4-demos_2.16.000.bb
index 435471c8e..813b3025d 100644
--- a/recipes-fsl/mcore-demos/imx-m4-demos_2.16.000.bb
+++ b/recipes-fsl/mcore-demos/imx-m4-demos_2.16.000.bb
@@ -7,13 +7,10 @@ LIC_FILES_CHKSUM:mx7ulp-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a54
 LIC_FILES_CHKSUM:mx8mm-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
 LIC_FILES_CHKSUM:mx8mq-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
 
-SRC_URI[imx7ulp.md5sum] = "f971b57a6787adf24bf1135b69847c65"
 SRC_URI[imx7ulp.sha256sum] = "1fbb26f8e0a69a2e3925e07cf0cc4a13b13e3ff6321a2ba3dc39c454c82b398b"
 
-SRC_URI[imx8mm.md5sum] = "fe3d6cba7ad25f90f4cfdf22221ddd21"
 SRC_URI[imx8mm.sha256sum] = "a335b54b797c37be05c5b4e6aeabd02099f401de907186723361d1fc25ea3f24"
 
-SRC_URI[imx8mq.md5sum] = "e6da3b5fda929ac6989c7aa7633a9ab6"
 SRC_URI[imx8mq.sha256sum] = "09b7195ce553dae5808afcefaf6f76c79f7122ce4dd31fabd679b768607dea25"
 
 COMPATIBLE_MACHINE = "(mx7ulp-nxp-bsp|mx8mm-nxp-bsp|mx8mq-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb b/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb
index 888fd647d..0c2fe9a17 100644
--- a/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb
+++ b/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb
@@ -8,13 +8,10 @@ LIC_FILES_CHKSUM:mx8qm-nxp-bsp = "file://COPYING;md5=a632fefd1c359980434f9389833
 LIC_FILES_CHKSUM:mx8qxp-nxp-bsp = "file://COPYING;md5=a632fefd1c359980434f9389833cab3a"
 LIC_FILES_CHKSUM:mx8dx-nxp-bsp = "file://COPYING;md5=a632fefd1c359980434f9389833cab3a"
 
-SRC_URI[imx8dxl.md5sum] = "8850c04a8af91e2bd822cecd5ec56e12"
 SRC_URI[imx8dxl.sha256sum] = "66ddba970712ed394de4034b362334a12caa5865a6afc1dfb5a897bb55b4fcf1"
 
-SRC_URI[imx8qm.md5sum] = "5912ca94847ee56a7e8b866b211b67d9"
 SRC_URI[imx8qm.sha256sum] = "c695e72b0c7f609132f5990469cf950c03e137de887bd7e24d059c51a7b499be"
 
-SRC_URI[imx8qx.md5sum] = "5bc15014f59b2b11c71299fac608be5d"
 SRC_URI[imx8qx.sha256sum] = "bbb268a30a58a86e38966122191c8aa69f427c6c1d56b0ce81e518f4d652782a"
 
 COMPATIBLE_MACHINE = "(mx8dxl-nxp-bsp|mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dx-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-m7-demos_2.16.000.bb b/recipes-fsl/mcore-demos/imx-m7-demos_2.16.000.bb
index fab57a7f7..387d6527a 100644
--- a/recipes-fsl/mcore-demos/imx-m7-demos_2.16.000.bb
+++ b/recipes-fsl/mcore-demos/imx-m7-demos_2.16.000.bb
@@ -11,16 +11,12 @@ LIC_FILES_CHKSUM:mx8mpul-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5
 
 LIC_FILES_CHKSUM:mx95-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
 
-SRC_URI[imx8mn.md5sum] = "b7e2733d8f6c9469b52b36cf6dad1c5e"
 SRC_URI[imx8mn.sha256sum] = "ab608d621c8d74f42514799a732414184bd22f058a8a87a0ab75147a0fd5d99c"
 
-SRC_URI[imx8mnddr3l.md5sum] = "c99fdb271ab42390537845a6beb15cf3"
 SRC_URI[imx8mnddr3l.sha256sum] = "9c9477db2581640395ec3bc7524f89c2c09ffd2947d9186959343a8cf764ad28"
 
-SRC_URI[imx8mp.md5sum] = "4260822516833e8cedec61dd5be24e3e"
 SRC_URI[imx8mp.sha256sum] = "672af1e1d8fcc1ebd12b45c6dc4cfc7abc85ea9ebbf114d15f4bfe7540e24ea1"
 
-SRC_URI[imx95.md5sum] = "f9576f3a4fe730c111c877344ea93427"
 SRC_URI[imx95.sha256sum] = "8d394b62a4fbad8303acf43f9f8672e5d1c17f1af8f47d7665740272819c0cc1"
 
 COMPATIBLE_MACHINE = "(mx8mn-nxp-bsp|mx8mnul-nxp-bsp|mx8mp-nxp-bsp|mx8mpul-nxp-bsp|mx95-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-m7-demos_24.12.00.bb b/recipes-fsl/mcore-demos/imx-m7-demos_24.12.00.bb
new file mode 100644
index 000000000..17d90903a
--- /dev/null
+++ b/recipes-fsl/mcore-demos/imx-m7-demos_24.12.00.bb
@@ -0,0 +1,10 @@
+# Copyright 2023-2024 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+require imx-mcore-demos.inc
+
+LIC_FILES_CHKSUM:mx95-nxp-bsp = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
+
+SRC_URI[imx95.sha256sum] = "01603b53fd01181631b71f5139a4a3e215f7e03cc531638ef4fa805a678ede3d"
+
+COMPATIBLE_MACHINE = "(mx95-nxp-bsp)"
diff --git a/recipes-fsl/mcore-demos/imx-mcore-demos.inc b/recipes-fsl/mcore-demos/imx-mcore-demos.inc
index 11621752f..9b9553fcc 100644
--- a/recipes-fsl/mcore-demos/imx-mcore-demos.inc
+++ b/recipes-fsl/mcore-demos/imx-mcore-demos.inc
@@ -9,6 +9,7 @@ inherit deploy fsl-eula-unpack
 
 SOC                ?= "INVALID"
 SOC:mx7ulp-nxp-bsp  = "imx7ulp"
+SOC:mx7d-nxp-bsp    = "imx7d-sabresd"
 SOC:mx8dxl-nxp-bsp  = "imx8dxl"
 SOC:mx8mm-nxp-bsp   = "imx8mm"
 SOC:mx8mn-nxp-bsp   = "imx8mn"
@@ -32,26 +33,27 @@ MCORE_TYPE:mx8ulp-nxp-bsp  = "m33"
 MCORE_TYPE:mx93-nxp-bsp  = "m33"
 MCORE_TYPE:mx95-nxp-bsp  = "m7"
 
-SRC_URI = "${FSL_MIRROR}${SOC}-${MCORE_TYPE}-demo-${PV}.bin;name=${SOC};fsl-eula=true"
-
-S = "${WORKDIR}/${SOC}-${MCORE_TYPE}-demo-${PV}"
-
-#SRC_URI="https://www.nxp.com/lgfiles/NMG/MAD/YOCTO//imx93-m33-demo-2.14.0.bin;fsl-eula=true;name=imx93"
+SRC_URI = "${FSL_MIRROR}/${SOC}-${MCORE_TYPE}-demo-${PV}.bin;name=${SOC};fsl-eula=true"
 
+S = "${UNPACKDIR}/${SOC}-${MCORE_TYPE}-demo-${PV}"
 
 SCR = "SCR-${SOC}-${MCORE_TYPE}-demo.txt"
 
+MCORE_DEMO_FILE_EXTENSION               ?= "bin"
+MCORE_DEMO_FILE_EXTENSION:mx7ulp-nxp-bsp = "img"
+
 do_install () {
     install -d ${D}${nonarch_base_libdir}/firmware
-    install -m 0644 ${S}/*.elf ${D}${nonarch_base_libdir}/firmware
+    if ls ${S}/*.elf > /dev/null 2>&1; then
+        install -m 0644 ${S}/*.elf ${D}${nonarch_base_libdir}/firmware
+    fi
+    install -m 0644 ${S}/*.${MCORE_DEMO_FILE_EXTENSION} ${D}${nonarch_base_libdir}/firmware
 }
 
-DEPLOY_FILE_EXT       ?= "bin"
-DEPLOY_FILE_EXT:mx7ulp-nxp-bsp = "img"
-
 do_deploy () {
-   # Install the demo binaries
-   install -m 0644 ${S}/*.${DEPLOY_FILE_EXT} ${DEPLOYDIR}/
+    # Install the demo binaries
+    install -d ${DEPLOYDIR}/mcore-demos
+    install -m 0644 ${S}/*.${MCORE_DEMO_FILE_EXTENSION} ${DEPLOYDIR}/mcore-demos/
 }
 
 addtask deploy after do_install
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb b/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb
index 415587a82..09eac053b 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb
@@ -8,7 +8,6 @@ ISP_PKGS      ?= ""
 ISP_PKGS:mx8mp-nxp-bsp = " \
     isp-imx \
     basler-camera \
-    basler-camera-dev \
     kernel-module-isp-vvcam \
 "
 RDEPENDS:${PN} = " \