7 files changed, 27 insertions, 3 deletions
diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf
index de28488..5c86271 100644
--- a/conf/machine/apalis-imx8.conf
+++ b/conf/machine/apalis-imx8.conf
@@ -36,9 +36,9 @@ BOOT_SPACE = "65536"
 IMAGE_BOOTLOADER = "imx-boot"
 IMX_BOOT_SEEK = "32"
 
-EXTRA_IMAGEDEPENDS += "firmware-imx-8"
+EXTRA_IMAGEDEPENDS += "firmware-imx-8 u-boot-distro-boot"
 IMAGE_BOOT_FILES += "${MACHINE_BOOT_FILES}"
-MACHINE_BOOT_FILES = "hdmitxfw.bin dpfw.bin"
+MACHINE_BOOT_FILES = "boot.scr hdmitxfw.bin dpfw.bin"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex"
diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf
index 70532bc..7e930a9 100644
--- a/conf/machine/colibri-imx8x.conf
+++ b/conf/machine/colibri-imx8x.conf
@@ -35,6 +35,10 @@ BOOT_SPACE = "65536"
 IMAGE_BOOTLOADER = "imx-boot"
 IMX_BOOT_SEEK = "32"
 
+EXTRA_IMAGEDEPENDS += "u-boot-distro-boot"
+IMAGE_BOOT_FILES += "${MACHINE_BOOT_FILES}"
+MACHINE_BOOT_FILES = "boot.scr"
+
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex"
 PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils"
diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc
index d146b48..46911d0 100644
--- a/conf/machine/include/apalis-imx6.inc
+++ b/conf/machine/include/apalis-imx6.inc
@@ -7,6 +7,10 @@ OFFSET_SPL_PAYLOAD = "138"
 
 MACHINE_NAME = "Apalis-iMX6"
 
+EXTRA_IMAGEDEPENDS += "u-boot-distro-boot"
+IMAGE_BOOT_FILES += "${MACHINE_BOOT_FILES}"
+MACHINE_BOOT_FILES = "boot.scr"
+
 KERNEL_DEVICETREE_remove = "imx6q-apalis_v1_0-eval.dtb imx6q-apalis_v1_0-ixora.dtb"
 KERNEL_IMAGETYPE_${MACHINE} = "zImage"
 
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc
index 1272cc9..f5b8350 100644
--- a/conf/machine/include/colibri-imx6.inc
+++ b/conf/machine/include/colibri-imx6.inc
@@ -7,6 +7,10 @@ OFFSET_SPL_PAYLOAD = "138"
 
 MACHINE_NAME = "Colibri-iMX6"
 
+EXTRA_IMAGEDEPENDS += "u-boot-distro-boot"
+IMAGE_BOOT_FILES += "${MACHINE_BOOT_FILES}"
+MACHINE_BOOT_FILES = "boot.scr"
+
 KERNEL_IMAGETYPE_${MACHINE} = "zImage"
 
 UBOOT_SUFFIX = "img"
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
index 75d94ea..984b6f6 100644
--- a/conf/machine/include/colibri-imx6ull.inc
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -8,3 +8,7 @@ TORADEX_PRODUCT_IDS[0045] = "imx6ull-colibri-wifi-eval-v3.dtb"
 TORADEX_FLASH_TYPE = "rawnand"
 
 MACHINE_NAME = "Colibri-iMX6ULL"
+
+EXTRA_IMAGEDEPENDS += "u-boot-distro-boot"
+IMAGE_BOOT_FILES += "${MACHINE_BOOT_FILES}"
+MACHINE_BOOT_FILES = "boot.scr"
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc
index e62fcd7..b720cda 100644
--- a/conf/machine/include/colibri-imx7-emmc.inc
+++ b/conf/machine/include/colibri-imx7-emmc.inc
@@ -7,4 +7,8 @@ TORADEX_FLASH_TYPE = "emmc"
 
 MACHINE_NAME = "Colibri-iMX7-eMMC"
 
+EXTRA_IMAGEDEPENDS += "u-boot-distro-boot"
+IMAGE_BOOT_FILES += "${MACHINE_BOOT_FILES}"
+MACHINE_BOOT_FILES = "boot.scr"
+
 MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc
index 0767047..282ad6b 100644
--- a/conf/machine/include/colibri-imx7.inc
+++ b/conf/machine/include/colibri-imx7.inc
@@ -8,6 +8,10 @@ TORADEX_FLASH_TYPE = "rawnand"
 
 MACHINE_NAME = "Colibri-iMX7"
 
+EXTRA_IMAGEDEPENDS += "u-boot-distro-boot"
+IMAGE_BOOT_FILES += "${MACHINE_BOOT_FILES}"
+MACHINE_BOOT_FILES = "boot.scr"
+
 MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
 
-UBOOT_MAKE_TARGET_colibri-imx7 = "u-boot.imx"
-\ No newline at end of file
+UBOOT_MAKE_TARGET_colibri-imx7 = "u-boot.imx"