Update dtb list for iMX machines.

Allign with dtb changes from latest version of linux-imx.

Signed-off-by: Alexandru Palalau <ioan-alexandru.palalau@nxp.com>

diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf
index ef1552028f5d41b1fbea1dd522868f4fe8edf6da..9fa96fc6a6d5c1c59924bb55db5eae820fc2d3ee 100644 (file)
--- a/conf/machine/imx6sllevk.conf
+++ b/conf/machine/imx6sllevk.conf
@@ -1,8 +1,8 @@
 #@TYPE: Machine
-#@NAME: Freescale i.MX6SLL Evaluation Kit
+#@NAME: NXP i.MX6SLL Evaluation Kit
 #@SOC: i.MX6SLL
-#@DESCRIPTION: Machine configuration for Freescale i.MX6SLL EVK
-#@MAINTAINER: Lauren Post lauren.post@nxp.com
+#@DESCRIPTION: Machine configuration for NXP i.MX6SLL EVK
+#@MAINTAINER: Alexandru Palalau ioan-alexandru.palalau@nxp.com
 
 MACHINEOVERRIDES =. "mx6:mx6sll:"
 
@@ -11,7 +11,7 @@ include conf/machine/include/tune-cortexa9.inc
 
 MACHINE_FIRMWARE_append = " firmware-imx-epdc firmware-imx-brcm"
 
-KERNEL_DEVICETREE = "imx6sll-evk.dtb imx6sll-evk-btwifi.dtb"
+KERNEL_DEVICETREE = "imx6sll-evk.dtb imx6sll-evk-btwifi.dtb imx6sll-evk-reva.dtb" 
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6sllevk_config,sdcard"

diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index 01ebce6f687d148621b54cfabba594eb9ebaa6c2..c6c0091c08f2bd7699a1cdb1c30d188e156bbf48 100644 (file)
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -2,7 +2,7 @@
 #@NAME: NXP i.MX6UL Evaluation Kit
 #@SOC: i.MX6UL
 #@DESCRIPTION: Machine configuration for NXP i.MX6UL EVK
-#@MAINTAINER: Lauren Post <lauren.post@nxp.com>
+#@MAINTAINER: Alexandru Palalau <ioan-alexandru.palalau@nxp.com>
 
 MACHINEOVERRIDES =. "mx6:mx6ul:"
 

diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf
index b05216aca03f9176cec52f29a15255df3e04a73c..7931b5a4a3f6b39fe6e88b59342363bb568987bc 100644 (file)
--- a/conf/machine/imx6ullevk.conf
+++ b/conf/machine/imx6ullevk.conf
@@ -1,16 +1,17 @@
 #@TYPE: Machine
-#@NAME: Freescale i.MX6ULL Evaluation Kit
+#@NAME: NXP i.MX6ULL Evaluation Kit
 #@SOC: i.MX6ULL
-#@DESCRIPTION: Machine configuration for Freescale i.MX6ULL EVK
-#@MAINTAINER: Daiane Angolini <daiane.angolini@nxp.com>
+#@DESCRIPTION: Machine configuration for NXP i.MX6ULL EVK
+#@MAINTAINER: Alexandru Palalau <ioan-alexandru.palalau@nxp.com>
 
 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"
-
+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"
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6ull_14x14_evk_config,sdcard"
 UBOOT_CONFIG[mfgtool] = "mx6ull_14x14_evk_config"

diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf
index 69adb3dafab9dd86ddb2cb966560176a5f726009..5ff5bf1da1d04c10dcc9cc18366c94b6fd11f15a 100644 (file)
--- a/conf/machine/imx7ulpevk.conf
+++ b/conf/machine/imx7ulpevk.conf
@@ -2,7 +2,7 @@
 #@NAME: NXP i.MX7ULP Evaluation Kit
 #@SOC: i.MX7ULP
 #@DESCRIPTION: Machine configuration for NXP i.MX7ULP EVK
-#@MAINTAINER: Lauren Post <Lauren.Post@nxp.com>
+#@MAINTAINER: Alexandru Palalau <ioan-alexandru.palalau@nxp.com>
 
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa7.inc
@@ -11,9 +11,11 @@ MACHINE_FEATURES += " pci wifi bluetooth qca9377"
 
 MACHINEOVERRIDES =. "mx7:mx7ulp:"
 
-KERNEL_DEVICETREE = "imx7ulp-evk.dtb imx7ulp-evk-emmc.dtb imx7ulp-evk-emmc-qspi.dtb imx7ulp-evk-ft5416.dtb imx7ulp-evk-mipi.dtb"
-KERNEL_DEVICETREE += "imx7ulp-evk-lpuart.dtb imx7ulp-evk-qspi.dtb imx7ulp-evk-sd1.dtb imx7ulp-evk-sensors-to-i2c5.dtb"
-KERNEL_DEVICETREE += "imx7ulp-evk-wm8960.dtb"
+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"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx7ulp_evk_config,sdcard"

diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf
index 6c92ac3a44def2e8d87912893d42b6de8441d0f6..8294476f564574e95698206dcbb17b167ac0cfd5 100644 (file)
--- a/conf/machine/imx8mmevk.conf
+++ b/conf/machine/imx8mmevk.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: NXP i.MX 8M Mini Evaluation Kit
+#@NAME: NXP i.MX8MM LPDDR4 Evaluation Kit and i.MX8MM DDR4 Evaluation Kit
 #@SOC: i.MX8MM
-#@DESCRIPTION: Machine configuration for NXP i.MX 8M Mini EVK
+#@DESCRIPTION: Machine configuration for NXP i.MX8MMini LPDDR4 EVK and i.MX8MMini DDR4 EVK
 #@MAINTAINER: Jun Zhu <junzhu@nxp.com>
 
 MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:"
@@ -11,13 +11,12 @@ require conf/machine/include/tune-cortexa53.inc
 
 MACHINE_FEATURES += " pci wifi bluetooth optee qca9377 qca6174"
 
-KERNEL_DEVICETREE = "freescale/fsl-imx8mm-evk.dtb "
-KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-ak4497.dtb freescale/fsl-imx8mm-evk-ak5558.dtb "
-KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-audio-tdm.dtb "
-KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-inmate.dtb "
-KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-m4.dtb "
-KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-rm67191.dtb "
-KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-root.dtb"
+KERNEL_DEVICETREE = "freescale/fsl-imx8mm-evk.dtb \
+                     freescale/fsl-imx8mm-evk-ak4497.dtb freescale/fsl-imx8mm-evk-ak5558.dtb \
+                     freescale/fsl-imx8mm-evk-audio-tdm.dtb freescale/fsl-imx8mm-evk-inmate.dtb \
+                     freescale/fsl-imx8mm-evk-m4.dtb freescale/fsl-imx8mm-evk-rm67191.dtb \
+                     freescale/fsl-imx8mm-ddr4-evk.dtb freescale/fsl-imx8mm-ddr4-evk-rm67191.dtb \
+                     freescale/fsl-imx8mm-ddr4-qca9377-evk.dtb freescale/fsl-imx8mm-evk-root.dtb"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "imx8mm_evk_config,sdcard"

diff --git a/conf/machine/imx8mqevk.conf b/conf/machine/imx8mqevk.conf
index af0e30488873a3e4de745e43c1b720015ea77575..b3cd2e0ea4d29c4ea871f00d29935cf3d552c3ef 100644 (file)
--- a/conf/machine/imx8mqevk.conf
+++ b/conf/machine/imx8mqevk.conf
@@ -2,7 +2,7 @@
 #@NAME: NXP i.MX8MQ Evaluation Kit
 #@SOC: i.MX8MQ
 #@DESCRIPTION: Machine configuration for NXP i.MX8MQ EVK
-#@MAINTAINER: Jun Zhu <junzhu@nxp.com>
+#@MAINTAINER: Alexandru Palalau <ioan-alexandru.palalau@nxp.com>
 
 MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:"
 
@@ -13,13 +13,19 @@ 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 "
-KERNEL_DEVICETREE += "freescale/fsl-imx8mq-evk-audio-tdm.dtb"
-KERNEL_DEVICETREE += "freescale/fsl-imx8mq-evk-dcss-adv7535.dtb freescale/fsl-imx8mq-evk-dcss-rm67191.dtb"
-KERNEL_DEVICETREE += "freescale/fsl-imx8mq-evk-dual-display.dtb freescale/fsl-imx8mq-evk-drm.dtb "
-KERNEL_DEVICETREE += "freescale/fsl-imx8mq-evk-lcdif-adv7535.dtb"
-KERNEL_DEVICETREE += "freescale/fsl-imx8mq-evk-m4.dtb freescale/fsl-imx8mq-evk-mipi-csi2.dtb"
-KERNEL_DEVICETREE += "freescale/fsl-imx8mq-evk-pcie1-m2.dtb freescale/fsl-imx8mq-evk-pdm.dtb"
+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"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "imx8mq_evk_config,sdcard"

diff --git a/conf/machine/imx8qmmek.conf b/conf/machine/imx8qmmek.conf
index 77b7ebaa931388e3a4f5318258ceda95387aac59..66d55eb349e09a3512a1809980daa5bfcb563239 100644 (file)
--- a/conf/machine/imx8qmmek.conf
+++ b/conf/machine/imx8qmmek.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
 #@NAME: i.MX 8QM MEK
 #@DESCRIPTION: i.MX 8QuadMax MEK board
-#@MAINTAINER: Jun Zhu <junzhu@nxp.com>
+#@MAINTAINER: Alexandru Palalau <ioan-alexandru.palalau@nxp.com>
 
 MACHINEOVERRIDES =. "mx8:mx8qm:"
 
@@ -22,15 +22,19 @@ SERIAL_CONSOLES = "115200;ttyAMA0"
 # auto-serial-console there
 USE_VT = "0"
 
-KERNEL_DEVICETREE = "freescale/fsl-imx8qm-mek.dtb"
-KERNEL_DEVICETREE += "freescale/fsl-imx8qm-mek_ca53.dtb freescale/fsl-imx8qm-mek_ca72.dtb "
-KERNEL_DEVICETREE += "freescale/fsl-imx8qm-mek-8cam.dtb "
-KERNEL_DEVICETREE += "freescale/fsl-imx8qm-mek-hdmi.dtb "
-KERNEL_DEVICETREE += "freescale/fsl-imx8qm-mek-jdi-wuxga-lvds1-panel.dtb freescale/fsl-imx8qm-mek-dsi-rm67191.dtb"
-KERNEL_DEVICETREE += "freescale/fsl-imx8qm-mek-mipi-ov5640.dtb freescale/fsl-imx8qm-mek-mipi-two-ov5640.dtb"
-KERNEL_DEVICETREE += "freescale/fsl-imx8qm-mek-enet2-tja1100.dtb "
-KERNEL_DEVICETREE += "freescale/fsl-imx8qm-mek-dom0.dtb freescale/fsl-imx8qm-mek-domu.dtb"
-KERNEL_DEVICETREE += "freescale/fsl-imx8qp-lpddr4-arm2.dtb"
+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 "
 
 UBOOT_MAKE_TARGET = "u-boot.bin"
 UBOOT_SUFFIX = "bin"

diff --git a/conf/machine/imx8qxpmek.conf b/conf/machine/imx8qxpmek.conf
index d0c353a842c58bd4ca4ba74b6a12361c14934bd1..f976d12df7d5c598053c20c8fa38b4a6c5c749ad 100644 (file)
--- a/conf/machine/imx8qxpmek.conf
+++ b/conf/machine/imx8qxpmek.conf
@@ -1,6 +1,7 @@
 #@TYPE: Machine
 #@NAME: i.MX 8QXP MEK
 #@DESCRIPTION: i.MX 8QXP Multisensory Enablement Kit (MEK) board
+#@MAINTAINER: Alexandru Palalau <ioan-alexandru.palalau@nxp.com>
 
 MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:"
 
@@ -21,11 +22,15 @@ SERIAL_CONSOLES = "115200;ttyAMA0"
 # auto-serial-console there
 USE_VT = "0"
 
-KERNEL_DEVICETREE = "freescale/fsl-imx8qxp-mek.dtb freescale/fsl-imx8qxp-mek-dom0.dtb"
-KERNEL_DEVICETREE += "freescale/fsl-imx8qxp-mek-dsi-rm67191.dtb"
-KERNEL_DEVICETREE += "freescale/fsl-imx8qxp-mek-enet2.dtb freescale/fsl-imx8qxp-mek-enet2-tja1100.dtb"
-KERNEL_DEVICETREE += "freescale/fsl-imx8qxp-mek-csi.dtb"
-KERNEL_DEVICETREE += "freescale/fsl-imx8qxp-mek-mipi-ov5640.dtb freescale/fsl-imx8qxp-mek-ov5640.dtb"
+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-ov5640-rpmsg.dtb \
+                     freescale/fsl-imx8qxp-mek-rpmsg.dtb freescale/fsl-imx8qxp-mek-root.dtb"
 
 UBOOT_MAKE_TARGET = "u-boot.bin"
 UBOOT_SUFFIX = "bin"