summaryrefslogtreecommitdiff
path: root/conf/machine/include/colibri-imx6.inc
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine/include/colibri-imx6.inc')
-rw-r--r--conf/machine/include/colibri-imx6.inc9
1 files changed, 8 insertions, 1 deletions
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc
index 588f8e3..b13d103 100644
--- a/conf/machine/include/colibri-imx6.inc
+++ b/conf/machine/include/colibri-imx6.inc
@@ -7,11 +7,18 @@ OFFSET_SPL_PAYLOAD = "138"
MACHINE_NAME = "Colibri-iMX6"
-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"
KERNEL_IMAGETYPE_${MACHINE} = "zImage"
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"
+PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
UBOOT_SUFFIX = "img"
MACHINE_FIRMWARE_remove = "firmware-imx-epdc"