imx8mm-lpddr4-evk: follow changed device tree name

The kernel from rel_imx_5.4.70_2.3.0 got one device tree name changed:
imx8mm-evk-revb.dts -> imx8mm-evk-revb-qca-wifi.dts
Follow that in the machine config to keep the machine buildable.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

diff --git a/conf/machine/imx8mm-ddr4-evk.conf b/conf/machine/imx8mm-ddr4-evk.conf
index 4e9d39231812f3554c4966f04843cf32160cc382..3901bb92c3a068495b4a835c01b07fdde272c1df 100644 (file)
--- a/conf/machine/imx8mm-ddr4-evk.conf
+++ b/conf/machine/imx8mm-ddr4-evk.conf
@@ -9,6 +9,7 @@ require include/imx8mm-evk.inc
 KERNEL_DEVICETREE_BASENAME = "${MACHINE}"
 KERNEL_DEVICETREE_append_use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67191.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-revb.dtb \
 "
 
 UBOOT_CONFIG_BASENAME = "imx8mm_ddr4_evk"

diff --git a/conf/machine/imx8mm-lpddr4-evk.conf b/conf/machine/imx8mm-lpddr4-evk.conf
index 3f712893735b041cc4aaef73637c16b8b713c78e..8fd3547973292e0371f7dc0649655ecd98704499 100644 (file)
--- a/conf/machine/imx8mm-lpddr4-evk.conf
+++ b/conf/machine/imx8mm-lpddr4-evk.conf
@@ -15,6 +15,7 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \
        freescale/${KERNEL_DEVICETREE_BASENAME}-ak5558.dtb \
        freescale/${KERNEL_DEVICETREE_BASENAME}-audio-tdm.dtb \
        freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \
+       freescale/${KERNEL_DEVICETREE_BASENAME}-revb-qca-wifi.dtb \
        freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \
        freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
        freescale/${KERNEL_DEVICETREE_BASENAME}-usd-wifi.dtb \

diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index 722555677efff90d7ee8b18d5ac58474e29979d1..20bc9b77f82b40526b6786eb13c69f75efde4fa8 100644 (file)
--- a/conf/machine/include/imx8mm-evk.inc
+++ b/conf/machine/include/imx8mm-evk.inc
@@ -16,7 +16,6 @@ KERNEL_DEVICETREE = " \
 "
 KERNEL_DEVICETREE_append_use-nxp-bsp = " \
        freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \
-       freescale/${KERNEL_DEVICETREE_BASENAME}-revb.dtb \
        freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \
 "
 UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb"