summaryrefslogtreecommitdiffstats
path: root/conf/machine
diff options
context:
space:
mode:
authorHiraku Toyooka <hiraku.toyooka@cybertrust.co.jp>2017-10-05 13:21:03 +0900
committerOtavio Salvador <otavio@ossystems.com.br>2017-10-05 15:32:48 -0300
commit776afcc34fe430e5818dec533f04cdb2828a5e3d (patch)
treea59e73abd9bba397f9e413138480754a54b154a5 /conf/machine
parent9a6ba3c67baa0ed4f9c78ab24c141035e34afe6c (diff)
downloadmeta-freescale-776afcc34fe430e5818dec533f04cdb2828a5e3d.tar.gz
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>
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/imx6qdlsabreauto.conf5
-rw-r--r--conf/machine/imx6qdlsabresd.conf5
-rw-r--r--conf/machine/imx6slevk.conf1
-rw-r--r--conf/machine/imx6sxsabreauto.conf1
-rw-r--r--conf/machine/imx6sxsabresd.conf1
-rw-r--r--conf/machine/imx6ulevk.conf1
-rw-r--r--conf/machine/imx7dsabresd.conf1
7 files changed, 15 insertions, 0 deletions
diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index 0eed1e5c..fabd4cd0 100644
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -26,6 +26,11 @@ KERNEL_DEVICETREE = " \
26 imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb \ 26 imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb \
27 imx6dl-sabreauto-flexcan1.dtb imx6dl-sabreauto-enetirq.dtb \ 27 imx6dl-sabreauto-flexcan1.dtb imx6dl-sabreauto-enetirq.dtb \
28" 28"
29KERNEL_DEVICETREE_use-mainline-bsp = " \
30 imx6qp-sabreauto.dtb \
31 imx6q-sabreauto.dtb \
32 imx6dl-sabreauto.dtb \
33"
29 34
30UBOOT_MACHINE ?= "mx6sabreauto_defconfig" 35UBOOT_MACHINE ?= "mx6sabreauto_defconfig"
31UBOOT_MAKE_TARGET = "all" 36UBOOT_MAKE_TARGET = "all"
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index 91ca9b45..7cde5059 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -26,6 +26,11 @@ KERNEL_DEVICETREE = " \
26 imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \ 26 imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
27 imx6dl-sabresd-enetirq.dtb imx6dl-sabresd-btwifi.dtb \ 27 imx6dl-sabresd-enetirq.dtb imx6dl-sabresd-btwifi.dtb \
28" 28"
29KERNEL_DEVICETREE_use-mainline-bsp = " \
30 imx6qp-sabresd.dtb \
31 imx6q-sabresd.dtb \
32 imx6dl-sabresd.dtb \
33"
29 34
30UBOOT_MACHINE ?= "mx6sabresd_defconfig" 35UBOOT_MACHINE ?= "mx6sabresd_defconfig"
31UBOOT_MAKE_TARGET = "all" 36UBOOT_MAKE_TARGET = "all"
diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index 52b4000e..ffcbaaa7 100644
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -11,6 +11,7 @@ include conf/machine/include/tune-cortexa9.inc
11 11
12KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-csi.dtb imx6sl-evk-ldo.dtb \ 12KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-csi.dtb imx6sl-evk-ldo.dtb \
13 imx6sl-evk-uart.dtb imx6sl-evk-btwifi.dtb" 13 imx6sl-evk-uart.dtb imx6sl-evk-btwifi.dtb"
14KERNEL_DEVICETREE_use-mainline-bsp = "imx6sl-evk.dtb"
14 15
15UBOOT_CONFIG ??= "sd" 16UBOOT_CONFIG ??= "sd"
16UBOOT_CONFIG[sd] = "mx6slevk_config,sdcard" 17UBOOT_CONFIG[sd] = "mx6slevk_config,sdcard"
diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf
index 19a8d9f8..ca5c9746 100644
--- a/conf/machine/imx6sxsabreauto.conf
+++ b/conf/machine/imx6sxsabreauto.conf
@@ -10,6 +10,7 @@ require conf/machine/include/imx-base.inc
10require conf/machine/include/tune-cortexa9.inc 10require conf/machine/include/tune-cortexa9.inc
11 11
12KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb imx6sx-sabreauto-m4.dtb" 12KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb imx6sx-sabreauto-m4.dtb"
13KERNEL_DEVICETREE_use-mainline-bsp = "imx6sx-sabreauto.dtb"
13 14
14PREFERRED_PROVIDER_u-boot = "u-boot-imx" 15PREFERRED_PROVIDER_u-boot = "u-boot-imx"
15PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx" 16PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index f7946361..3a969e4a 100644
--- 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 \
13 imx6sx-sdb-sai.dtb imx6sx-sdb-lcdif1.dtb imx6sx-sdb-ldo.dtb \ 13 imx6sx-sdb-sai.dtb imx6sx-sdb-lcdif1.dtb imx6sx-sdb-ldo.dtb \
14 imx6sx-sdb-reva-ldo.dtb imx6sx-sdb-reva.dtb \ 14 imx6sx-sdb-reva-ldo.dtb imx6sx-sdb-reva.dtb \
15 imx6sx-sdb-btwifi.dtb imx6sx-sdb-mqs.dtb" 15 imx6sx-sdb-btwifi.dtb imx6sx-sdb-mqs.dtb"
16KERNEL_DEVICETREE_use-mainline-bsp = "imx6sx-sdb.dtb imx6sx-sdb-sai.dtb imx6sx-sdb-reva.dtb"
16 17
17UBOOT_CONFIG ??= "sd" 18UBOOT_CONFIG ??= "sd"
18UBOOT_CONFIG[sd] = "mx6sxsabresd_config,sdcard" 19UBOOT_CONFIG[sd] = "mx6sxsabresd_config,sdcard"
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index 1b55a4ad..14f83828 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -14,6 +14,7 @@ MACHINE_FEATURES += " pci wifi bluetooth"
14KERNEL_DEVICETREE = "imx6ul-14x14-evk.dtb imx6ul-14x14-evk-csi.dtb imx6ul-14x14-evk-btwifi.dtb \ 14KERNEL_DEVICETREE = "imx6ul-14x14-evk.dtb imx6ul-14x14-evk-csi.dtb imx6ul-14x14-evk-btwifi.dtb \
15 imx6ul-14x14-evk-gpmi-weim.dtb imx6ul-14x14-evk-usb-certi.dtb \ 15 imx6ul-14x14-evk-gpmi-weim.dtb imx6ul-14x14-evk-usb-certi.dtb \
16 imx6ul-14x14-evk-emmc.dtb " 16 imx6ul-14x14-evk-emmc.dtb "
17KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb"
17 18
18UBOOT_SUFFIX = "img" 19UBOOT_SUFFIX = "img"
19SPL_BINARY = "SPL" 20SPL_BINARY = "SPL"
diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index 3a05d169..f77e537e 100644
--- 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 \
16 imx7d-sdb-reva.dtb imx7d-sdb-reva-epdc.dtb imx7d-sdb-reva-gpmi-weim.dtb \ 16 imx7d-sdb-reva.dtb imx7d-sdb-reva-epdc.dtb imx7d-sdb-reva-gpmi-weim.dtb \
17 imx7d-sdb-reva-hdmi-audio.dtb imx7d-sdb-reva-m4.dtb imx7d-sdb-reva-qspi.dtb \ 17 imx7d-sdb-reva-hdmi-audio.dtb imx7d-sdb-reva-m4.dtb imx7d-sdb-reva-qspi.dtb \
18 imx7d-sdb-reva-touch.dtb imx7d-sdb-reva-wm8960.dtb" 18 imx7d-sdb-reva-touch.dtb imx7d-sdb-reva-wm8960.dtb"
19KERNEL_DEVICETREE_use-mainline-bsp = "imx7d-sdb.dtb"
19 20
20UBOOT_CONFIG ??= "sd" 21UBOOT_CONFIG ??= "sd"
21UBOOT_CONFIG[sd] = "mx7dsabresd_secure_config,sdcard" 22UBOOT_CONFIG[sd] = "mx7dsabresd_secure_config,sdcard"