diff --git a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
index b2fb3f108..c9afd118b 100644
--- a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
@@ -43,8 +43,5 @@ BT_TTY ?= "ttymxc1"
 # XBee
 XBEE_TTY ?= "ttymxc4"
 
-# U-Boot script to be copied to the boot image
-BOOT_SCRIPTS = "boot.scr:boot.scr"
-
 # Flash image types
 IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard.gz tar.bz2 recovery.vfat"
diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf
index 0bc0af470..9d76e4c37 100644
--- a/meta-digi-arm/conf/machine/ccimx6sbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf
@@ -43,8 +43,5 @@ BT_TTY ?= "ttymxc1"
 # XBee
 XBEE_TTY ?= "ttymxc4"
 
-# U-Boot script to be copied to the boot image
-BOOT_SCRIPTS = "boot.scr:boot.scr"
-
 # Flash image types
 IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard.gz tar.bz2 recovery.vfat"
diff --git a/meta-digi-arm/conf/machine/ccimx6ulsbc.conf b/meta-digi-arm/conf/machine/ccimx6ulsbc.conf
index f11849f3c..4a926d3b0 100644
--- a/meta-digi-arm/conf/machine/ccimx6ulsbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6ulsbc.conf
@@ -39,8 +39,5 @@ BT_TTY ?= "ttymxc0"
 # XBee
 XBEE_TTY ?= "ttymxc1"
 
-# U-Boot script to be copied to the boot image
-BOOT_SCRIPTS = "boot.scr:boot.scr"
-
 # Flash image types
 IMAGE_FSTYPES ?= "tar.bz2 ubifs boot.ubifs recovery.ubifs"
diff --git a/meta-digi-arm/conf/machine/ccimx6ulstarter.conf b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf
index 3bb83e1cb..a4489d533 100644
--- a/meta-digi-arm/conf/machine/ccimx6ulstarter.conf
+++ b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf
@@ -35,9 +35,6 @@ SERIAL_CONSOLES ?= "115200;ttymxc4"
 # Bluetooth tty
 BT_TTY ?= "ttymxc0"
 
-# U-Boot script to be copied to the boot image
-BOOT_SCRIPTS = "boot.scr:boot.scr"
-
 # Flash image types
 IMAGE_FSTYPES ?= "tar.bz2 ubifs boot.ubifs recovery.ubifs"
 
diff --git a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
index 2628634d3..075d5e8c8 100644
--- a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
@@ -41,8 +41,5 @@ XBEE_RESET_N_GPIO ?= "mca-gpio@15,gpio1@8"
 XBEE_SLEEP_RQ_GPIO ?= "mca-gpio@11,gpio1@7"
 XBEE_TTY ?= "ttymxc3"
 
-# U-Boot script to be copied to the boot image
-BOOT_SCRIPTS = "boot.scr:boot.scr"
-
 # Flash image types
 IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard.gz tar.bz2 recovery.vfat"
diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
index 1eb371574..7aaf86105 100644
--- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
@@ -43,8 +43,5 @@ XBEE_RESET_N_GPIO ?= "mca-gpio@15,gpio1@8"
 XBEE_SLEEP_RQ_GPIO ?= "mca-gpio@11,gpio1@7"
 XBEE_TTY ?= "ttymxc3"
 
-# U-Boot script to be copied to the boot image
-BOOT_SCRIPTS = "boot.scr:boot.scr"
-
 # Flash image types
 IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard.gz tar.bz2 recovery.vfat"
diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
index 209297c1f..9ce413d90 100644
--- a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
+++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
@@ -29,8 +29,5 @@ XBEE_RESET_N_GPIO ?= "gpio3@13"
 XBEE_SLEEP_RQ_GPIO ?= "gpio3@16"
 XBEE_TTY ?= "ttyLP0"
 
-# U-Boot script to be copied to the boot image
-BOOT_SCRIPTS = "boot.scr:boot.scr"
-
 # Flash image types
 IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard.gz tar.bz2 recovery.vfat"
diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf
index 7206a9a95..faa916d60 100644
--- a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf
+++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf
@@ -42,8 +42,6 @@ XBEE_RESET_N_GPIO ?= "mca-gpio@15"
 XBEE_SLEEP_RQ_GPIO ?= "mca-gpio@11"
 XBEE_TTY ?= "ttyMCA0"
 
-# U-Boot script to be copied to the boot image
-BOOT_SCRIPTS = "boot.scr:boot.scr"
 UBOOT_HAS_FASTBOOT = "true"
 
 # Flash image types
diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc
index 8daf9a1f6..b2a6f9271 100644
--- a/meta-digi-arm/conf/machine/include/digi-defaults.inc
+++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc
@@ -82,3 +82,6 @@ GRAPHICAL_IMAGES ?= "dey-image-qt dey-image-webkit"
 
 # Include DEY SELinux policy modifications by default
 DEY_SELINUX_POLICY ?= "1"
+
+# U-Boot scripts to include in 'linux' partition
+BOOT_SCRIPTS = "boot.scr:boot.scr"