From 29126c67d573f446f837b11a5d911cd0b00a13ea Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 23 Mar 2020 13:05:05 +0100 Subject: colibri-imx7, colibri-imx7-emmc: deploy additional device trees Related-to: ELB-2593 Signed-off-by: Max Krummenacher --- conf/machine/colibri-imx7-emmc.conf | 11 ++++++++++- conf/machine/include/colibri-imx7.inc | 8 ++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) 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 ebc7a37..92144e8 100644 --- a/conf/machine/include/colibri-imx7.inc +++ b/conf/machine/include/colibri-imx7.inc @@ -14,6 +14,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" UBOOT_MAKE_TARGET_colibri-imx7 = "u-boot.imx" -- cgit v1.2.3