machine: imx[6,7,8]: update dtb references for 5.4 kernel

Updated kernel has some DTS files added and some dropped for various
i.MX derivatives. Those should be aligned with respective machines in
order to deliver proper DTB files, and do not fail the build for those
are missing.

Device tree files listed in respective machines are those only present
in updated 5.4 kernel release from NXP. Derivatives, which relied on
those device trees that are discarded from the new kernel release should
backport their respective files onto that update.

In other words: if after this update the DTS file used for the HW happens
to be missing - it should be manually added for that HW, since the default
version is no longer provided by NXP in their updated kernel tree.

Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>

diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index ec43e4640946b4cf8f47134fcca7c621797b2c7d..2fe95dc6dd616cf8dbe4c9ee39546978718d2506 100644 (file)
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -17,14 +17,23 @@ require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa9.inc
 
 KERNEL_DEVICETREE = " \
-    imx6qp-sabresd.dtb imx6qp-sabresd-btwifi.dtb imx6qp-sabresd-hdcp.dtb \
-    imx6qp-sabresd-ldo.dtb imx6qp-sabresd-ldo-pcie-cert.dtb \
-    \
-    imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \
-    imx6q-sabresd-enetirq.dtb imx6q-sabresd-btwifi.dtb \
-    \
-    imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
-    imx6dl-sabresd-enetirq.dtb imx6dl-sabresd-btwifi.dtb \
+       imx6qp-sabresd-btwifi.dtb \
+       imx6qp-sabresd.dtb \
+       imx6qp-sabresd-hdcp.dtb \
+       imx6qp-sabresd-ldo.dtb \
+       \
+       imx6q-sabresd-btwifi.dtb \
+       imx6q-sabresd.dtb \
+       imx6q-sabresd-enetirq.dtb \
+       imx6q-sabresd-hdcp.dtb \
+       imx6q-sabresd-ldo.dtb \
+       imx6q-sabresd-uart.dtb \
+       \
+       imx6dl-sabresd-btwifi.dtb \
+       imx6dl-sabresd.dtb \
+       imx6dl-sabresd-enetirq.dtb \
+       imx6dl-sabresd-hdcp.dtb \
+       imx6dl-sabresd-ldo.dtb \
 "
 KERNEL_DEVICETREE_use-mainline-bsp = " \
     imx6qp-sabresd.dtb \

diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf
index b26605d43ef9723a364301e7e10ed4592dd14b65..1bdb1080e5779c4ba7c40aeca8619f0b4ea46071 100644 (file)
--- a/conf/machine/imx6sxsabreauto.conf
+++ b/conf/machine/imx6sxsabreauto.conf
@@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx6:mx6sx:"
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa9.inc
 
-KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb imx6sx-sabreauto-m4.dtb"
+KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb"
 KERNEL_DEVICETREE_use-mainline-bsp = "imx6sx-sabreauto.dtb"
 
 PREFERRED_PROVIDER_u-boot = "u-boot-imx"

diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index fa786b0df37284b50787cc43bdb351634d8459ae..18b6b04b6180202b9567cae27d77ca424ae4ea4f 100644 (file)
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -11,9 +11,16 @@ include conf/machine/include/tune-cortexa7.inc
 
 MACHINE_FEATURES += " pci wifi bluetooth"
 
-KERNEL_DEVICETREE = "imx6ul-14x14-evk.dtb imx6ul-14x14-evk-csi.dtb imx6ul-14x14-evk-btwifi.dtb \
-                     imx6ul-14x14-evk-gpmi-weim.dtb imx6ul-14x14-evk-usb-certi.dtb \
-                     imx6ul-14x14-evk-emmc.dtb "
+KERNEL_DEVICETREE = " \
+       imx6ul-14x14-evk-btwifi.dtb \
+       imx6ul-14x14-evk-btwifi-oob.dtb \
+       imx6ul-14x14-evk-csi.dtb \
+       imx6ul-14x14-evk.dtb \
+       imx6ul-14x14-evk-ecspi.dtb \
+       imx6ul-14x14-evk-ecspi-slave.dtb \
+       imx6ul-14x14-evk-emmc.dtb \
+       imx6ul-14x14-evk-gpmi-weim.dtb \
+"
 KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb"
 
 # Use fslc u-boot by default. See also imx-base.inc.

diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf
index 7931b5a4a3f6b39fe6e88b59342363bb568987bc..9351954fac73065aa9ca0535c5af0139c36239b2 100644 (file)
--- a/conf/machine/imx6ullevk.conf
+++ b/conf/machine/imx6ullevk.conf
@@ -9,9 +9,14 @@ MACHINEOVERRIDES =. "mx6:mx6ull:"
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa7.inc
 
-KERNEL_DEVICETREE = "imx6ull-14x14-evk.dtb imx6ull-14x14-evk-btwifi.dtb \
-                     imx6ull-14x14-evk-btwifi-oob.dtb imx6ull-14x14-evk-emmc.dtb \
-                     imx6ull-14x14-evk-gpmi-weim.dtb imx6ull-14x14-evk-usb-certi.dtb"
+KERNEL_DEVICETREE = " \
+       imx6ull-14x14-evk-btwifi.dtb \
+       imx6ull-14x14-evk-btwifi-oob.dtb \
+       imx6ull-14x14-evk.dtb \
+       imx6ull-14x14-evk-emmc.dtb \
+       imx6ull-14x14-evk-gpmi-weim.dtb \
+"
+
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6ull_14x14_evk_config,sdcard"
 UBOOT_CONFIG[mfgtool] = "mx6ull_14x14_evk_config"

diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index 2a4f8e6c071da3cab71833eac840afbc58b4f28d..84de3862ae0263f3b2d9a8b859fd16a0c38f8b54 100644 (file)
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -11,11 +11,17 @@ require conf/machine/include/tune-cortexa7.inc
 
 MACHINE_FEATURES += " pci wifi bluetooth"
 
-KERNEL_DEVICETREE = "imx7d-sdb.dtb imx7d-sdb-epdc.dtb imx7d-sdb-gpmi-weim.dtb \
-                     imx7d-sdb-m4.dtb imx7d-sdb-mipi-dsi.dtb imx7d-sdb-qspi.dtb \
-                     imx7d-sdb-reva.dtb imx7d-sdb-reva-epdc.dtb imx7d-sdb-reva-gpmi-weim.dtb \
-                     imx7d-sdb-reva-hdmi-audio.dtb imx7d-sdb-reva-m4.dtb imx7d-sdb-reva-qspi.dtb \
-                     imx7d-sdb-reva-touch.dtb imx7d-sdb-reva-wm8960.dtb"
+KERNEL_DEVICETREE = " \
+       imx7d-sdb.dtb \
+       imx7d-sdb-epdc.dtb \
+       imx7d-sdb-gpmi-weim.dtb \
+       imx7d-sdb-m4.dtb \
+       imx7d-sdb-mipi-dsi.dtb \
+       imx7d-sdb-qspi.dtb \
+       imx7d-sdb-reva.dtb \
+       imx7d-sdb-sht11.dtb \
+"
+
 KERNEL_DEVICETREE_use-mainline-bsp = "imx7d-sdb.dtb"
 
 UBOOT_CONFIG ??= "sd"

diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf
index 31b88c2c8dbda29a25cc959f0ca562637a22c9cf..d9d2a5592ab81095621958d788286e34a09e1354 100644 (file)
--- a/conf/machine/imx7ulpevk.conf
+++ b/conf/machine/imx7ulpevk.conf
@@ -11,11 +11,20 @@ require conf/machine/include/tune-cortexa7.inc
 
 MACHINE_FEATURES += " pci wifi bluetooth qca9377"
 
-KERNEL_DEVICETREE = "imx7ulp-evk.dtb imx7ulp-evkb-emmc.dtb imx7ulp-evk-emmc-qspi.dtb imx7ulp-evk-ft5416.dtb imx7ulp-evk-mipi.dtb \
-                     imx7ulp-evkb-lpuart.dtb imx7ulp-evk-qspi.dtb imx7ulp-evkb-sd1.dtb imx7ulp-evkb-sensors-to-i2c5.dtb \
-                     imx7ulp-evkb-spi-slave.dtb imx7ulp-evk-wm8960.dtb \
-                     imx7ulp-evkb.dtb imx7ulp-evkb-mipi.dtb \
-                     imx7ulp-evkb-rm68200-wxga.dtb imx7ulp-evkb-rm68191-qhd.dtb"
+KERNEL_DEVICETREE = " \
+       imx7ulp-evkb.dtb \
+       imx7ulp-evkb-emmc.dtb \
+       imx7ulp-evkb-lpuart.dtb \
+       imx7ulp-evkb-mipi.dtb \
+       imx7ulp-evkb-rm68191-qhd.dtb \
+       imx7ulp-evkb-rm68200-wxga.dtb \
+       imx7ulp-evkb-sd1.dtb \
+       imx7ulp-evkb-sensors-to-i2c5.dtb \
+       imx7ulp-evkb-spi-slave.dtb \
+       imx7ulp-evk.dtb \
+       imx7ulp-evk-ft5416.dtb \
+       imx7ulp-evk-mipi.dtb \
+"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx7ulp_evk_config,sdcard"

diff --git a/conf/machine/imx8mqevk.conf b/conf/machine/imx8mqevk.conf
index d6aa3a9f8b39954eed1aa4e15a448c2a4ed91385..40794c35d79201643decc6a44a8ad98cdb0112b9 100644 (file)
--- a/conf/machine/imx8mqevk.conf
+++ b/conf/machine/imx8mqevk.conf
@@ -15,19 +15,22 @@ MACHINE_FEATURES += "pci wifi bluetooth optee qca6174"
 
 MACHINE_SOCARCH_FILTER_append_mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d"
 
-KERNEL_DEVICETREE = "freescale/fsl-imx8mq-evk.dtb freescale/fsl-imx8mq-evk-ak4497.dtb \
-                     freescale/fsl-imx8mq-evk-audio-tdm.dtb freescale/fsl-imx8mq-evk-b3.dtb \
-                     freescale/fsl-imx8mq-evk-dcss-adv7535.dtb freescale/fsl-imx8mq-evk-dcss-rm67191.dtb \
-                     freescale/fsl-imx8mq-evk-dcss-adv7535-b3.dtb freescale/fsl-imx8mq-evk-dcss-rm67191-b3.dtb \
-                     freescale/fsl-imx8mq-evk-dual-display-b3.dtb \
-                     freescale/fsl-imx8mq-evk-dual-display.dtb freescale/fsl-imx8mq-evk-drm.dtb \
-                     freescale/fsl-imx8mq-evk-dp.dtb freescale/fsl-imx8mq-evk-edp.dtb \
-                     freescale/fsl-imx8mq-evk-inmate.dtb \
-                     freescale/fsl-imx8mq-evk-lcdif-adv7535.dtb \
-                     freescale/fsl-imx8mq-evk-lcdif-adv7535-b3.dtb \
-                     freescale/fsl-imx8mq-evk-m4.dtb freescale/fsl-imx8mq-evk-mipi-csi2.dtb \
-                     freescale/fsl-imx8mq-evk-pcie1-m2.dtb freescale/fsl-imx8mq-evk-pdm.dtb \
-                     freescale/fsl-imx8mq-evk-root.dtb"
+KERNEL_DEVICETREE = " \
+       freescale/imx8mq-evk-ak4497.dtb \
+       freescale/imx8mq-evk-audio-tdm.dtb \
+       freescale/imx8mq-evk-dcss-adv7535.dtb \
+       freescale/imx8mq-evk-dcss-rm67191.dtb \
+       freescale/imx8mq-evk-dp.dtb \
+       freescale/imx8mq-evk.dtb \
+       freescale/imx8mq-evk-dual-display.dtb \
+       freescale/imx8mq-evk-inmate.dtb \
+       freescale/imx8mq-evk-lcdif-adv7535.dtb \
+       freescale/imx8mq-evk-lcdif-rm67191.dtb \
+       freescale/imx8mq-evk-pcie1-m2.dtb \
+       freescale/imx8mq-evk-pdm.dtb \
+       freescale/imx8mq-evk-root.dtb \
+       freescale/imx8mq-evk-rpmsg.dtb \
+"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "imx8mq_evk_config,sdcard"

diff --git a/conf/machine/imx8qmmek.conf b/conf/machine/imx8qmmek.conf
index 6c91172b2c1b8cce51001756416cd4e79be66b03..c92e5fd2dd0c327d05a45b0eef34b215b43372de 100644 (file)
--- a/conf/machine/imx8qmmek.conf
+++ b/conf/machine/imx8qmmek.conf
@@ -24,19 +24,22 @@ SERIAL_CONSOLES = "115200;ttyAMA0"
 # auto-serial-console there
 USE_VT = "0"
 
-KERNEL_DEVICETREE = "freescale/fsl-imx8qm-mek.dtb \
-                     freescale/fsl-imx8qm-mek_ca53.dtb freescale/fsl-imx8qm-mek_ca72.dtb \
-                     freescale/fsl-imx8qm-mek-dom0.dtb freescale/fsl-imx8qm-mek-dom0-dpu2.dtb \
-                     freescale/fsl-imx8qm-mek-domu-car.dtb \
-                     freescale/fsl-imx8qm-mek-domu-dpu1.dtb freescale/fsl-imx8qm-mek-domu-dpu1-hdmi.dtb \
-                     freescale/fsl-imx8qm-mek-domu.dtb \
-                     freescale/fsl-imx8qm-mek-dsi-rm67191.dtb freescale/fsl-imx8qm-mek-dsp.dtb \
-                     freescale/fsl-imx8qm-mek-enet2-tja1100.dtb \
-                     freescale/fsl-imx8qm-mek-hdmi.dtb freescale/fsl-imx8qm-mek-hdmi-in.dtb \
-                     freescale/fsl-imx8qm-mek-inmate.dtb freescale/fsl-imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \
-                     freescale/fsl-imx8qm-mek-ov5640.dtb \
-                     freescale/fsl-imx8qm-mek-root.dtb \
-                     freescale/fsl-imx8qm-mek-rpmsg.dtb "
+KERNEL_DEVICETREE = " \
+       freescale/imx8qm-mek-ca53.dtb \
+       freescale/imx8qm-mek-ca72.dtb \
+       freescale/imx8qm-mek-dom0.dtb \
+       freescale/imx8qm-mek-domu.dtb \
+       freescale/imx8qm-mek-dsi-rm67191.dtb \
+       freescale/imx8qm-mek-dsp.dtb \
+       freescale/imx8qm-mek.dtb \
+       freescale/imx8qm-mek-enet2-tja1100.dtb \
+       freescale/imx8qm-mek-hdmi.dtb \
+       freescale/imx8qm-mek-inmate.dtb \
+       freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \
+       freescale/imx8qm-mek-ov5640.dtb \
+       freescale/imx8qm-mek-root.dtb \
+       freescale/imx8qm-mek-rpmsg.dtb \
+"
 
 UBOOT_MAKE_TARGET = "u-boot.bin"
 UBOOT_SUFFIX = "bin"

diff --git a/conf/machine/imx8qxpmek.conf b/conf/machine/imx8qxpmek.conf
index 920c7f0b4a3198a25b6d167e4bfc3fbb1aaac198..bdce4b68ba60862f0d37e2781854087defbf4238 100644 (file)
--- a/conf/machine/imx8qxpmek.conf
+++ b/conf/machine/imx8qxpmek.conf
@@ -24,15 +24,25 @@ SERIAL_CONSOLES = "115200;ttyAMA0"
 # auto-serial-console there
 USE_VT = "0"
 
-KERNEL_DEVICETREE = "freescale/fsl-imx8qxp-mek.dtb freescale/fsl-imx8qxp-mek-dom0.dtb \
-                     freescale/fsl-imx8qxp-mek-dsi-rm67191.dtb freescale/fsl-imx8qxp-mek-dsp.dtb \
-                     freescale/fsl-imx8qxp-mek-enet2.dtb freescale/fsl-imx8qxp-mek-enet2-tja1100.dtb \
-                     freescale/fsl-imx8qxp-mek-it6263-lvds0-dual-channel.dtb freescale/fsl-imx8qxp-mek-it6263-lvds1-dual-channel.dtb \
-                     freescale/fsl-imx8qxp-mek-inmate.dtb \
-                     freescale/fsl-imx8qxp-mek-lcdif.dtb \
-                     freescale/fsl-imx8qxp-mek-jdi-wuxga-lvds1-panel.dtb freescale/fsl-imx8qxp-mek-jdi-wuxga-lvds0-panel.dtb \
-                     freescale/fsl-imx8qxp-mek-ov5640.dtb \
-                     freescale/fsl-imx8qxp-mek-rpmsg.dtb freescale/fsl-imx8qxp-mek-root.dtb"
+KERNEL_DEVICETREE = " \
+       freescale/imx8qxp-mek-a0.dtb \
+       freescale/imx8qxp-mek-dom0.dtb \
+       freescale/imx8qxp-mek-dsi-rm67191.dtb \
+       freescale/imx8qxp-mek-dsp.dtb \
+       freescale/imx8qxp-mek.dtb \
+       freescale/imx8qxp-mek-enet2.dtb \
+       freescale/imx8qxp-mek-enet2-tja1100.dtb \
+       freescale/imx8qxp-mek-inmate.dtb \
+       freescale/imx8qxp-mek-it6263-lvds0-dual-channel.dtb \
+       freescale/imx8qxp-mek-it6263-lvds1-dual-channel.dtb \
+       freescale/imx8qxp-mek-jdi-wuxga-lvds0-panel.dtb \
+       freescale/imx8qxp-mek-jdi-wuxga-lvds1-panel.dtb \
+       freescale/imx8qxp-mek-ov5640.dtb \
+       freescale/imx8qxp-mek-root.dtb \
+       freescale/imx8qxp-mek-rpmsg.dtb \
+       freescale/imx8qxp-mek-sof-cs42888.dtb \
+       freescale/imx8qxp-mek-sof-wm8960.dtb \
+"
 
 UBOOT_MAKE_TARGET = "u-boot.bin"
 UBOOT_SUFFIX = "bin"