summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2020-03-23 13:05:05 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2020-03-30 09:33:01 +0200
commit66d1c4fc6e224ad7a749c1dd72dc5eb978691b6c (patch)
tree823ae374a2f4d0a784af478782a822b2465c6a05
parent28e901b9884286420810af7c5e9339b0bf132975 (diff)
colibri-imx7, colibri-imx7-emmc: deploy additional device trees
Related-to: ELB-2593 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 29126c67d573f446f837b11a5d911cd0b00a13ea)
-rw-r--r--conf/machine/colibri-imx7-emmc.conf11
-rw-r--r--conf/machine/include/colibri-imx7.inc8
2 files changed, 18 insertions, 1 deletions
diff --git a/conf/machine/colibri-imx7-emmc.conf b/conf/machine/colibri-imx7-emmc.conf
index ddcf24b..6f651bb 100644
--- a/conf/machine/colibri-imx7-emmc.conf
+++ b/conf/machine/colibri-imx7-emmc.conf
@@ -11,7 +11,16 @@ include conf/machine/include/tune-cortexa7.inc
PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex"
KERNEL_IMAGETYPE = "zImage"
-KERNEL_DEVICETREE += "imx7d-colibri-emmc-eval-v3.dtb imx7d-colibri-emmc-aster.dtb"
+KERNEL_DEVICETREE += " \
+ imx7d-colibri-emmc-aster.dtb \
+ imx7d-colibri-emmc-eval-v3.dtb \
+ imx7d-colibri-emmc-iris.dtb \
+ imx7d-colibri-emmc-iris-v2.dtb \
+"
+KERNEL_DEVICETREE_use-mainline-bsp += " \
+ imx7d-colibri-emmc-aster.dtb \
+ imx7d-colibri-emmc-eval-v3.dtb \
+"
# The kernel lives in a seperate FAT partition, don't deploy it in /boot/
RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc
index 773c27d..af2624d 100644
--- a/conf/machine/include/colibri-imx7.inc
+++ b/conf/machine/include/colibri-imx7.inc
@@ -16,6 +16,14 @@ WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
+KERNEL_DEVICETREE += " \
+ imx7d-colibri-iris.dtb imx7s-colibri-iris.dtb \
+ imx7d-colibri-iris-v2.dtb imx7s-colibri-iris-v2.dtb \
+"
+KERNEL_DEVICETREE_use-mainline-bsp += " \
+ imx7d-colibri-eval-v3.dtb imx7s-colibri-eval-v3.dtb \
+ imx7d-colibri-aster.dtb imx7s-colibri-aster.dtb \
+"
PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt"
PREFERRED_PROVIDER_virtual/kernel_upstream = "linux-toradex-mainline"
PREFERRED_PROVIDER_virtual/kernel_upstream_preempt-rt = "linux-toradex-mainline-rt"