Merge pull request #1434 from thochstein/misc

Upgrade imx-sc-firmware, update machine devicetrees for NXP BSP

5 files changed, 6 insertions, 2 deletions

diff --git a/conf/machine/imx8mn-lpddr4-evk.conf b/conf/machine/imx8mn-lpddr4-evk.conf
index aeccfdda..25103706 100644
--- a/conf/machine/imx8mn-lpddr4-evk.conf
+++ b/conf/machine/imx8mn-lpddr4-evk.conf
@@ -11,6 +11,7 @@ KERNEL_DEVICETREE_BASENAME = "imx8mn-evk"
 KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-usd-wifi.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-revE.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-swpdm.dtb \
 "
diff --git a/conf/machine/imx8mp-lpddr4-evk.conf b/conf/machine/imx8mp-lpddr4-evk.conf
index 9ec19008..39108716 100644
--- a/conf/machine/imx8mp-lpddr4-evk.conf
+++ b/conf/machine/imx8mp-lpddr4-evk.conf
@@ -35,6 +35,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/imx8mp-evk-ov2775.dtb \
     freescale/imx8mp-evk-ov2775-ov5640.dtb \
     freescale/imx8mp-evk-pcie-ep.dtb \
+    freescale/imx8mp-evk-revA3-8mic-revE.dtb \
     freescale/imx8mp-evk-rm67191.dtb \
     freescale/imx8mp-evk-rm67199.dtb \
     freescale/imx8mp-evk-root.dtb \
diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf
index a83e46ea..d35a2831 100644
--- a/conf/machine/imx8qm-mek.conf
+++ b/conf/machine/imx8qm-mek.conf
@@ -41,6 +41,7 @@ KERNEL_DEVICETREE = " \
     freescale/imx8qm-mek-ov5640.dtb \
     freescale/imx8qm-mek-pcie-ep.dtb \
     freescale/imx8qm-mek-rpmsg.dtb \
+    freescale/imx8qm-mek-sof.dtb \
     freescale/imx8qm-mek-sof-cs42888.dtb \
     freescale/imx8qm-mek-sof-wm8960.dtb \
     freescale/imx8qm-mek-usd-wifi.dtb \
diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf
index de8208d3..5c8df513 100644
--- a/conf/machine/imx8qxp-mek.conf
+++ b/conf/machine/imx8qxp-mek.conf
@@ -17,6 +17,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif-rpmsg.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-sof.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-sof-cs42888.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8960.dtb \
 "
diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.14.0.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb
index 6f6c3409..3273c270 100644
--- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.14.0.bb
+++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb
@@ -10,8 +10,8 @@ inherit fsl-eula-unpack pkgconfig deploy
 
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
 
-SRC_URI[md5sum] = "bc4a96de0e2ce0476a0727dd7e667bff"
-SRC_URI[sha256sum] = "a1ea7a94b5d8dd50a8e82fd37d424facabdd0228dedd08cd3da2c43d61da6126"
+SRC_URI[md5sum] = "d608eb2b3d312da1dbde55b8514c1e0f"
+SRC_URI[sha256sum] = "1272ac5c31a88017ef548721f3acf930a7eda6ac73aa9f41b5f0cade9d5c0e5f"
 
 BOARD_TYPE ?= "mek"
 SC_FIRMWARE_NAME ?= "INVALID"