9 files changed, 40 insertions, 171 deletions

diff --git a/conf/machine/imx93-14x14-lpddr4x-evk.conf b/conf/machine/imx93-14x14-lpddr4x-evk.conf
new file mode 100644
index 00000000..56b8a3c5
--- /dev/null
+++ b/conf/machine/imx93-14x14-lpddr4x-evk.conf
@@ -0,0 +1,33 @@
+#@TYPE: Machine
+#@NAME: NXP i.MX 93 14x14 Evaluation Kit with LPDDR4X
+#@SOC: i.MX93
+#@DESCRIPTION: Machine configuration for NXP i.MX 93 14x14 EVK with LPDDR4X
+#@MAINTAINER: Jun Zhu <junzhu@nxp.com>
+
+MACHINEOVERRIDES =. "mx93:"
+
+require conf/machine/include/imx93-evk.inc
+
+KERNEL_DEVICETREE_BASENAME = "imx93-14x14-evk"
+
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-aud-hat.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-tja1103.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-mqs.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-lvds-it6263.dtb \
+"
+
+UBOOT_CONFIG_BASENAME = "imx93_14x14_evk"
+IMXBOOT_TARGETS_BASENAME = "flash_singleboot"
+
+DDR_FIRMWARE_NAME = " \
+    lpddr4_dmem_1d_v202201.bin \
+    lpddr4_dmem_2d_v202201.bin \
+    lpddr4_imem_1d_v202201.bin \
+    lpddr4_imem_2d_v202201.bin \
+"
+
+UBOOT_CONFIG[fspi]   = "${UBOOT_CONFIG_BASENAME}_defconfig"
+
+IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', '${IMXBOOT_TARGETS_BASENAME}', d)}"
diff --git a/recipes-dpaa2/management-complex/management-complex_10.14.1.bb b/recipes-dpaa2/management-complex/management-complex_10.14.1.bb
deleted file mode 100644
index 4d4f1dcd..00000000
--- a/recipes-dpaa2/management-complex/management-complex_10.14.1.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-SUMMARY = "DPAA2 Management Complex Firmware"
-LICENSE = "NXP-Binary-EULA"
-LIC_FILES_CHKSUM = "file://NXP-Binary-EULA.txt;md5=afcb1213054384820390d410ab62105f"
-
-inherit deploy
-
-INHIBIT_DEFAULT_DEPS = "1"
-
-SRC_URI = "git://github.com/nxp/qoriq-mc-binary;nobranch=1;protocol=https"
-SRCREV = "408110ee632f6291545b0b156cd74e7e3b4612cc"
-
-S = "${WORKDIR}/git"
-
-REGLEX:ls2088a = "ls2088a"
-REGLEX:ls2080a = "ls2080a"
-REGLEX:ls1088a = "ls1088a"
-REGLEX:lx2160a = "lx2160a"
-
-do_install () {
-    install -d ${D}/boot
-    install -m 755 ${S}/${REGLEX}/*.itb ${D}/boot
-}
-
-do_deploy () {
-    install -d ${DEPLOYDIR}/mc_app
-    install -m 755 ${S}/${REGLEX}/*.itb ${DEPLOYDIR}/mc_app
-    # make a symlink to the latest binary
-    for mc_binary in `find ${DEPLOYDIR}/mc_app -type f -printf "%f\n" |sort`;do
-        ln -sfT ${mc_binary} ${DEPLOYDIR}/mc_app/mc.itb
-    done
-}
-addtask deploy before do_build after do_install
-
-PACKAGES += "${PN}-image"
-FILES:${PN}-image += "/boot"
-
-INHIBIT_PACKAGE_STRIP = "1"
-
-COMPATIBLE_MACHINE = "(qoriq-arm64)"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
diff --git a/recipes-dpaa2/management-complex/management-complex_10.20.4.bb b/recipes-dpaa2/management-complex/management-complex_10.20.4.bb
deleted file mode 100644
index 07f26b29..00000000
--- a/recipes-dpaa2/management-complex/management-complex_10.20.4.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-SUMMARY = "DPAA2 Management Complex Firmware"
-LICENSE = "NXP-Binary-EULA"
-LIC_FILES_CHKSUM = "file://NXP-Binary-EULA.txt;md5=73d4b970c18882e229e4bf1ada5bb8d6"
-
-inherit deploy
-
-INHIBIT_DEFAULT_DEPS = "1"
-
-SRC_URI = "git://github.com/nxp/qoriq-mc-binary;nobranch=1;protocol=https"
-SRCREV = "f73683596a7b72124d67b62e64f3dc2bb36b9321"
-
-S = "${WORKDIR}/git"
-
-REGLEX:ls2088a = "ls2088a"
-REGLEX:ls2080a = "ls2080a"
-REGLEX:ls1088a = "ls1088a"
-REGLEX:lx2160a = "lx2160a"
-
-do_install () {
-    install -d ${D}/boot
-    install -m 755 ${S}/${REGLEX}/*.itb ${D}/boot
-}
-
-do_deploy () {
-    install -d ${DEPLOYDIR}/mc_app
-    install -m 755 ${S}/${REGLEX}/*.itb ${DEPLOYDIR}/mc_app
-    # make a symlink to the latest binary
-    for mc_binary in `find ${DEPLOYDIR}/mc_app -type f -printf "%f\n" |sort`;do
-        ln -sfT ${mc_binary} ${DEPLOYDIR}/mc_app/mc.itb
-    done
-}
-addtask deploy before do_build after do_install
-
-PACKAGES += "${PN}-image"
-FILES:${PN}-image += "/boot"
-
-INHIBIT_PACKAGE_STRIP = "1"
-
-COMPATIBLE_MACHINE = "(qoriq-arm64)"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
diff --git a/recipes-dpaa2/management-complex/management-complex_10.24.0.bb b/recipes-dpaa2/management-complex/management-complex_10.24.0.bb
deleted file mode 100644
index 3408fba0..00000000
--- a/recipes-dpaa2/management-complex/management-complex_10.24.0.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-SUMMARY = "DPAA2 Management Complex Firmware"
-LICENSE = "NXP-Binary-EULA"
-LIC_FILES_CHKSUM = "file://NXP-Binary-EULA.txt;md5=481d6288552113961a835bbabceb0c33"
-
-inherit deploy
-
-INHIBIT_DEFAULT_DEPS = "1"
-
-SRC_URI = "git://github.com/nxp/qoriq-mc-binary;nobranch=1;protocol=https"
-SRCREV = "324817697a4c89a9a940fb7dba1b18909913ee20"
-
-S = "${WORKDIR}/git"
-
-REGLEX:ls2088a = "ls2088a"
-REGLEX:ls2080a = "ls2080a"
-REGLEX:ls1088a = "ls1088a"
-REGLEX:lx2160a = "lx216xa"
-REGLEX:lx2162a = "lx216xa"
-
-do_install () {
-    install -d ${D}/boot
-    install -m 755 ${S}/${REGLEX}/*.itb ${D}/boot
-}
-
-do_deploy () {
-    install -d ${DEPLOYDIR}/mc_app
-    install -m 755 ${S}/${REGLEX}/*.itb ${DEPLOYDIR}/mc_app
-    # make a symlink to the latest binary
-    for mc_binary in `find ${DEPLOYDIR}/mc_app -type f -printf "%f\n" |sort`;do
-        ln -sfT ${mc_binary} ${DEPLOYDIR}/mc_app/mc.itb
-    done
-}
-addtask deploy before do_build after do_install
-
-PACKAGES += "${PN}-image"
-FILES:${PN}-image += "/boot"
-
-INHIBIT_PACKAGE_STRIP = "1"
-
-COMPATIBLE_MACHINE = "(qoriq-arm64)"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-dpaa2/management-complex/management-complex_10.29.0.bb b/recipes-dpaa2/management-complex/management-complex_10.29.0.bb
deleted file mode 100644
index 08991f09..00000000
--- a/recipes-dpaa2/management-complex/management-complex_10.29.0.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-SUMMARY = "DPAA2 Management Complex Firmware"
-LICENSE = "NXP-Binary-EULA"
-LIC_FILES_CHKSUM = "file://NXP-Binary-EULA.txt;md5=2cb2fee5d3558ee2a81331ed121647ad"
-
-inherit deploy
-
-INHIBIT_DEFAULT_DEPS = "1"
-
-SRC_URI = "git://github.com/nxp/qoriq-mc-binary;nobranch=1;protocol=https"
-SRCREV = "d21bc22000a14b0b6eeafc017fb93bc70499f74a"
-
-S = "${WORKDIR}/git"
-
-REGLEX:ls2088a = "ls2088a"
-REGLEX:ls2080a = "ls2080a"
-REGLEX:ls1088a = "ls1088a"
-REGLEX:lx2160a = "lx216xa"
-REGLEX:lx2162a = "lx216xa"
-
-do_install () {
-    install -d ${D}/boot
-    install -m 755 ${S}/${REGLEX}/*.itb ${D}/boot
-}
-
-do_deploy () {
-    install -d ${DEPLOYDIR}/mc_app
-    install -m 755 ${S}/${REGLEX}/*.itb ${DEPLOYDIR}/mc_app
-    # make a symlink to the latest binary
-    for mc_binary in `find ${DEPLOYDIR}/mc_app -type f -printf "%f\n" |sort`;do
-        ln -sfT ${mc_binary} ${DEPLOYDIR}/mc_app/mc.itb
-    done
-}
-addtask deploy before do_build after do_install
-
-PACKAGES += "${PN}-image"
-FILES:${PN}-image += "/boot"
-
-INHIBIT_PACKAGE_STRIP = "1"
-
-COMPATIBLE_MACHINE = "(qoriq-arm64)"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-dpaa2/management-complex/management-complex_10.35.0.bb b/recipes-dpaa2/management-complex/management-complex_10.37.0.bb
index d114a92e..c683654f 100644
--- a/recipes-dpaa2/management-complex/management-complex_10.35.0.bb
+++ b/recipes-dpaa2/management-complex/management-complex_10.37.0.bb
@@ -1,13 +1,13 @@
 SUMMARY = "DPAA2 Management Complex Firmware"
 LICENSE = "NXP-Binary-EULA"
-LIC_FILES_CHKSUM = "file://NXP-Binary-EULA.txt;md5=1db1363924ceccb1edea921b6495bdc2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=481d6288552113961a835bbabceb0c33"
 
 inherit deploy
 
 INHIBIT_DEFAULT_DEPS = "1"
 
 SRC_URI = "git://github.com/nxp/qoriq-mc-binary;protocol=https;nobranch=1"
-SRCREV = "836d7bf606b51c18b5e3726d68dcf3b3ac4de74a"
+SRCREV = "bb19f586b87b97878b4bd0d3e57da2ca40c5c69f"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-dpaa2/restool/restool_git.bb b/recipes-dpaa2/restool/restool_git.bb
index 3af4b8aa..1d1aeffe 100644
--- a/recipes-dpaa2/restool/restool_git.bb
+++ b/recipes-dpaa2/restool/restool_git.bb
@@ -1,11 +1,11 @@
 SUMMARY = "DPAA2 Resource Manager Tool"
 LICENSE = "BSD-3-Clause | GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ec8d84e9cd4de287e290275d09db27f0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ec8d84e9cd4de287e290275d09db27f0"
 
 SRC_URI = "git://github.com/nxp-qoriq/restool;protocol=https;nobranch=1 \
     file://disable-manpage-generation.patch \
 "
-SRCREV = "65c9a10d95b19e61d2f86dbcaa45d12ba98e85e1"
+SRCREV = "46604e41f4c7e54efa62503c6b4629321b21e056"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-dpaa2/spc/spc_git.bb b/recipes-dpaa2/spc/spc_git.bb
index 1ac61c69..2c695368 100644
--- a/recipes-dpaa2/spc/spc_git.bb
+++ b/recipes-dpaa2/spc/spc_git.bb
@@ -1,11 +1,11 @@
 SUMMARY = "Soft Parser Configuration tool"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=163b09a1c249a6ff2b28da1ceca2e0a8"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=163b09a1c249a6ff2b28da1ceca2e0a8"
 
 DEPENDS = "libxml2 fmlib tclap"
 
 SRC_URI = "git://github.com/nxp-qoriq/spc;protocol=https;nobranch=1"
-SRCREV = "398138687a3d3d6ef174501221711de74ff7bc40"
+SRCREV = "d624b7809be48e4cf29a7bfa201028e4de1d1955"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p1.0+fslc.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p1.2+fslc.bb
index 83acf000..1afbb9fc 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p1.0+fslc.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p1.2+fslc.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
 
 PV .= "+git${SRCPV}"
 
-SRCREV = "8c864975607cf455c5e95d5313aa00e69f48d32f"
+SRCREV = "1e65746bb15628ccbe88e3ee7a0a1d2becc48e79"
 SRC_URI = "git://github.com/Freescale/kernel-module-imx-gpu-viv.git;protocol=https;branch=master"
 
 S = "${WORKDIR}/git"