diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-03-23 13:05:05 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-06-09 18:53:14 +0200 |
| commit | 06f25d93a3b2c13fab0c2ff3ba17c781fd57dd33 (patch) | |
| tree | e80e82a7fac084bc42ff04bfabb4f42555ec964b /conf | |
| parent | a2c2698306ca7ae251ba52f8c7f16c3a9a427bcf (diff) | |
colibri-imx7, colibri-imx7-emmc: deploy additional device trees
Related-to: ELB-2593
(cherry picked from commit 29126c67d573f446f837b11a5d911cd0b00a13ea)
Corrected with changes to the machine conf files in meta-freescale-3rdparty.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/include/colibri-imx7-emmc.inc | 9 | ||||
| -rw-r--r-- | conf/machine/include/colibri-imx7.inc | 16 |
2 files changed, 13 insertions, 12 deletions
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc index 12f544d..07a3460 100644 --- a/conf/machine/include/colibri-imx7-emmc.inc +++ b/conf/machine/include/colibri-imx7-emmc.inc @@ -19,11 +19,12 @@ 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" -KERNEL_DEVICETREE_use-mainline-bsp = " \ - imx7d-colibri-emmc-aster.dtb imx7d-colibri-emmc-eval-v3.dtb \ +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + imx7d-colibri-emmc-iris.dtb \ + imx7d-colibri-emmc-iris-v2.dtb \ " -KERNEL_DEVICETREE_use-mainline-bsp_preempt-rt = " \ - imx7d-colibri-emmc-eval-v3.dtb \ +KERNEL_DEVICETREE_append_use-mainline-bsp = " \ + imx7d-colibri-emmc-aster.dtb \ " PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc index d56c940..6bd0453 100644 --- a/conf/machine/include/colibri-imx7.inc +++ b/conf/machine/include/colibri-imx7.inc @@ -16,18 +16,18 @@ WKS_FILE_DEPENDS_append = " u-boot-distro-boot" MACHINE_FIRMWARE_remove = "firmware-imx-epdc" +KERNEL_DEVICETREE_append_use-nxp-bsp += " \ + imx7d-colibri-iris.dtb imx7s-colibri-iris.dtb \ + imx7d-colibri-iris-v2.dtb imx7s-colibri-iris-v2.dtb \ +" +KERNEL_DEVICETREE_append_use-mainline-bsp = " \ + 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" -KERNEL_DEVICETREE_use-mainline-bsp = " \ - imx7d-colibri-aster.dtb imx7d-colibri-eval-v3.dtb \ - imx7s-colibri-aster.dtb imx7s-colibri-eval-v3.dtb \ -" -KERNEL_DEVICETREE_use-mainline-bsp_preempt-rt = " \ - imx7d-colibri-emmc-eval-v3.dtb \ - imx7s-colibri-eval-v3.dtb \ -" PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" UBOOT_MAKE_TARGET_colibri-imx7 = "u-boot.imx" |