machines: fix dtb build failure when use-mainline-bsp is used

When the use-mainline-bsp is used, dtb files listed in KERNEL_DEVICETREE
are different from ones to be build, so the build fails. This patch fixes
it by adding KERNEL_DEVICETREE_use_mainline_bsp.

Signed-off-by: Hiraku Toyooka <hiraku.toyooka@cybertrust.co.jp>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index 0eed1e5c235e63dbe120fd35591bcf1cb4264658..fabd4cd0d61d48efad1d6da899ddf75a8302bba0 100644 (file)
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -26,6 +26,11 @@ KERNEL_DEVICETREE = " \
     imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb \
     imx6dl-sabreauto-flexcan1.dtb imx6dl-sabreauto-enetirq.dtb \
 "
+KERNEL_DEVICETREE_use-mainline-bsp = " \
+    imx6qp-sabreauto.dtb \
+    imx6q-sabreauto.dtb \
+    imx6dl-sabreauto.dtb \
+"
 
 UBOOT_MACHINE ?= "mx6sabreauto_defconfig"
 UBOOT_MAKE_TARGET = "all"

diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index 91ca9b45023ab88a43775893cfa277ad25c4e563..7cde50592213fc5a2715124338f9a2b3e95b8bc1 100644 (file)
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -26,6 +26,11 @@ KERNEL_DEVICETREE = " \
     imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
     imx6dl-sabresd-enetirq.dtb imx6dl-sabresd-btwifi.dtb \
 "
+KERNEL_DEVICETREE_use-mainline-bsp = " \
+    imx6qp-sabresd.dtb \
+    imx6q-sabresd.dtb \
+    imx6dl-sabresd.dtb \
+"
 
 UBOOT_MACHINE ?= "mx6sabresd_defconfig"
 UBOOT_MAKE_TARGET = "all"

diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index 52b4000e47040916eed7c8a892d9feffec2e6866..ffcbaaa76578ced1767621097d9f13ad9214e754 100644 (file)
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -11,6 +11,7 @@ include conf/machine/include/tune-cortexa9.inc
 
 KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-csi.dtb imx6sl-evk-ldo.dtb \
                      imx6sl-evk-uart.dtb imx6sl-evk-btwifi.dtb"
+KERNEL_DEVICETREE_use-mainline-bsp = "imx6sl-evk.dtb"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6slevk_config,sdcard"

diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf
index 19a8d9f8f996af9f3d26ca7b201cdf72bcfc3437..ca5c97469b0b1ea8befde7c1bd8a51a500204794 100644 (file)
--- a/conf/machine/imx6sxsabreauto.conf
+++ b/conf/machine/imx6sxsabreauto.conf
@@ -10,6 +10,7 @@ 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_use-mainline-bsp = "imx6sx-sabreauto.dtb"
 
 PREFERRED_PROVIDER_u-boot = "u-boot-imx"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"

diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index f7946361f5be8bad2cba000704fda6691859b7f1..3a969e4a350ea20fc9d341c22e22786aff5c9a8b 100644 (file)
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -13,6 +13,7 @@ KERNEL_DEVICETREE = "imx6sx-sdb.dtb imx6sx-sdb-emmc.dtb imx6sx-sdb-m4.dtb \
                      imx6sx-sdb-sai.dtb imx6sx-sdb-lcdif1.dtb imx6sx-sdb-ldo.dtb \
                      imx6sx-sdb-reva-ldo.dtb imx6sx-sdb-reva.dtb \
                      imx6sx-sdb-btwifi.dtb imx6sx-sdb-mqs.dtb"
+KERNEL_DEVICETREE_use-mainline-bsp = "imx6sx-sdb.dtb imx6sx-sdb-sai.dtb imx6sx-sdb-reva.dtb"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6sxsabresd_config,sdcard"

diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index 1b55a4ad4feeebd4b36bc4e370183569b4ccadb0..14f83828a261db32ba0c0a54a5f230bd93cdccd9 100644 (file)
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -14,6 +14,7 @@ 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_use-mainline-bsp = "imx6ul-14x14-evk.dtb"
 
 UBOOT_SUFFIX = "img"
 SPL_BINARY = "SPL"

diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index 3a05d1691c8a6606538979f7167bedbe7748ae8f..f77e537ebbdeedb12614b2af69324abce1eb5bfa 100644 (file)
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -16,6 +16,7 @@ KERNEL_DEVICETREE = "imx7d-sdb.dtb imx7d-sdb-epdc.dtb imx7d-sdb-gpmi-weim.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_use-mainline-bsp = "imx7d-sdb.dtb"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx7dsabresd_secure_config,sdcard"