diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2019-10-17 14:14:57 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-06-09 18:53:14 +0200 |
commit | 1363460f7a2667048e4188207077b58709214b35 (patch) | |
tree | 0a15a873e1b62ec2088f25e9b11c3146d94ff8e9 /conf/machine/include/colibri-imx7-emmc.inc | |
parent | 6a74de45bfed1842912b580488f5d82baf4a5621 (diff) |
machines: choose upstream and upstream-rt kernel
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit 3d68713e7e28fae312fa869f0742a13edf1700c9)
Diffstat (limited to 'conf/machine/include/colibri-imx7-emmc.inc')
-rw-r--r-- | conf/machine/include/colibri-imx7-emmc.inc | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc index 6711a71..12f544d 100644 --- a/conf/machine/include/colibri-imx7-emmc.inc +++ b/conf/machine/include/colibri-imx7-emmc.inc @@ -7,10 +7,23 @@ TORADEX_FLASH_TYPE = "emmc" MACHINE_NAME = "Colibri-iMX7-eMMC" -PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" +MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp" + +MACHINE_BOOT_FILES = "boot.scr" +IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}" +WKS_FILE_DEPENDS_append = " u-boot-distro-boot" MACHINE_FIRMWARE_remove = "firmware-imx-epdc" 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-eval-v3.dtb" +KERNEL_DEVICETREE_use-mainline-bsp = " \ + imx7d-colibri-emmc-aster.dtb imx7d-colibri-emmc-eval-v3.dtb \ +" +KERNEL_DEVICETREE_use-mainline-bsp_preempt-rt = " \ + imx7d-colibri-emmc-eval-v3.dtb \ +" + +PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" |