meta: adapt to the latest changes in meta-freescale-3rdparty layer

The changes include:
- Set PREFERRED_PROVIDER_u-boot-default-script to u-boot-distro-boot.
- Drop MACHINE_BOOT_FILES, we dont have to maintain a extra variable.
- Drop colibri-imx7-emmc.conf file, it's already in
  meta-freescale-3rdparty layer, move Toradex related definitions to
  colibri-imx7-emmc.inc file.
- Drop u-boot-distro-boot from WKS_FILE_DEPENDS, to avoid multiple boot
  scripts in it.

Signed-off-by: Ming Liu <ming.liu@toradex.com>

10 files changed, 17 insertions, 58 deletions

diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf
index 5bb5592..4cb41fc 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"
 
-MACHINE_BOOT_FILES = "boot.scr hdmitxfw.bin dpfw.bin"
-IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
-WKS_FILE_DEPENDS_append = " firmware-imx-8 u-boot-distro-boot"
+IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr hdmitxfw.bin dpfw.bin"
+WKS_FILE_DEPENDS_append = " u-boot-default-script"
+PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt"
diff --git a/conf/machine/apalis-imx8x.conf b/conf/machine/apalis-imx8x.conf
index c0f61cd..f080a58 100644
--- a/conf/machine/apalis-imx8x.conf
+++ b/conf/machine/apalis-imx8x.conf
@@ -36,9 +36,9 @@ BOOT_SPACE = "65536"
 IMAGE_BOOTLOADER = "imx-boot"
 IMX_BOOT_SEEK = "32"
 
-MACHINE_BOOT_FILES = "boot.scr"
-IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
-WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
+IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
+WKS_FILE_DEPENDS_append = " u-boot-default-script"
+PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex"
diff --git a/conf/machine/colibri-imx7-emmc.conf b/conf/machine/colibri-imx7-emmc.conf
deleted file mode 100644
index ddcf24b..0000000
--- a/conf/machine/colibri-imx7-emmc.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-#@TYPE: Machine
-#@NAME: Toradex Colibri iMX7 Dual 1GB (eMMC)
-#@SOC: i.MX 7Dual
-#@DESCRIPTION: Machine configuration for Toradex Colibri iMX7 SOM
-#@MAINTAINER: Stefan Agner <stefan.agner@toradex.com>
-
-MACHINEOVERRIDES =. "mx7:mx7d:"
-
-include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa7.inc
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex"
-KERNEL_IMAGETYPE = "zImage"
-KERNEL_DEVICETREE += "imx7d-colibri-emmc-eval-v3.dtb imx7d-colibri-emmc-aster.dtb"
-
-# The kernel lives in a seperate FAT partition, don't deploy it in /boot/
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
-
-PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex"
-PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils"
-UBOOT_MACHINE ?= "colibri_imx7_emmc_defconfig"
-
-IMAGE_FSTYPES += "wic.gz tar.xz"
-# wic support
-WKS_FILE = "sdimage-bootpart.wks"
-WIC_CREATE_EXTRA_ARGS_append = " --no-fstab-update"
-
-SERIAL_CONSOLES = "115200;ttymxc0"
-
-MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g"
diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf
index 440b3ec..52f0769 100644
--- a/conf/machine/colibri-imx8x.conf
+++ b/conf/machine/colibri-imx8x.conf
@@ -42,9 +42,9 @@ BOOT_SPACE = "65536"
 IMAGE_BOOTLOADER = "imx-boot"
 IMX_BOOT_SEEK = "32"
 
-MACHINE_BOOT_FILES = "boot.scr"
-IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
-WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
+IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
+WKS_FILE_DEPENDS_append = " u-boot-default-script"
+PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt"
diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc
index 3086519..0e0176c 100644
--- a/conf/machine/include/apalis-imx6.inc
+++ b/conf/machine/include/apalis-imx6.inc
@@ -7,9 +7,7 @@ OFFSET_SPL_PAYLOAD = "138"
 
 MACHINE_NAME = "Apalis-iMX6"
 
-MACHINE_BOOT_FILES = "boot.scr"
-IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
-WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
+PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
 KERNEL_IMAGETYPE_${MACHINE} = "zImage"
 PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt"
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc
index 5977dcd..588f8e3 100644
--- a/conf/machine/include/colibri-imx6.inc
+++ b/conf/machine/include/colibri-imx6.inc
@@ -7,9 +7,7 @@ OFFSET_SPL_PAYLOAD = "138"
 
 MACHINE_NAME = "Colibri-iMX6"
 
-MACHINE_BOOT_FILES = "boot.scr"
-IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
-WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
+PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
 KERNEL_IMAGETYPE_${MACHINE} = "zImage"
 PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt"
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
index c028702..1a10a0f 100644
--- a/conf/machine/include/colibri-imx6ull.inc
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -9,9 +9,7 @@ TORADEX_FLASH_TYPE = "rawnand"
 
 MACHINE_NAME = "Colibri-iMX6ULL"
 
-MACHINE_BOOT_FILES = "boot.scr"
-IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
-WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
+PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
 UBOOT_ENTRYPOINT_colibri-imx6ull = "0x81000000"
 
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc
index 1503682..6711a71 100644
--- a/conf/machine/include/colibri-imx7-emmc.inc
+++ b/conf/machine/include/colibri-imx7-emmc.inc
@@ -7,9 +7,7 @@ TORADEX_FLASH_TYPE = "emmc"
 
 MACHINE_NAME = "Colibri-iMX7-eMMC"
 
-MACHINE_BOOT_FILES = "boot.scr"
-IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
-WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
+PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
 MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
 
diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc
index d1142a2..399ab5a 100644
--- a/conf/machine/include/colibri-imx7.inc
+++ b/conf/machine/include/colibri-imx7.inc
@@ -8,9 +8,7 @@ TORADEX_FLASH_TYPE = "rawnand"
 
 MACHINE_NAME = "Colibri-iMX7"
 
-MACHINE_BOOT_FILES = "boot.scr"
-IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
-WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
+PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
 MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
 
diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf
index b02c59b..49b6506 100644
--- a/conf/machine/verdin-imx8mm.conf
+++ b/conf/machine/verdin-imx8mm.conf
@@ -37,9 +37,9 @@ IMAGE_BOOTLOADER = "imx-boot"
 # Set imx-mkimage boot target
 IMXBOOT_TARGETS = "flash_evk_emmc_fastboot"
 
-MACHINE_BOOT_FILES = "boot.scr"
-IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
-WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
+IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
+WKS_FILE_DEPENDS_append = " u-boot-default-script"
+PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
 LOADADDR = ""
 UBOOT_SUFFIX = "bin"