From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Sat, 30 Jan 2021 17:28:38 +0000 (+0100)
Subject: imx8mm-lpddr4-evk: follow changed device tree name
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=7b0ddeabeeab1493570985296632f78b8deed858;p=meta-freescale.git

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 4e9d3923..3901bb92 100644
--- 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 3f712893..8fd35479 100644
--- 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 72255567..20bc9b77 100644
--- 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"