summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMing Liu <ming.liu@toradex.com>2019-08-09 16:45:27 +0800
committerMing Liu <ming.liu@toradex.int>2019-08-27 03:35:00 +0000
commit4ddeb406d8a817aa5c9a72b320a984da958073d3 (patch)
treeddc82167ac08b5df9f61c1c1a2d6335fcebe85ea
parentd1ff6c6cc8a268ec141481b3744859ba633c16ff (diff)
meta: drop useless EXTRA_IMAGEDEPENDS
For the recipes listed in EXTRA_IMAGEDEPENDS, bitbake would create a dependency as: | image_pn:do_image_complete -> imagedepends_pn:do_populate_sysroot but we actually need a image task depend on the deploy tasks of EXTRA_IMAGEDEPENDS recipes, setting EXTRA_IMAGEDEPENDS would not help with that, so drop it, use WKS_FILE_DEPENDS instead. Signed-off-by: Ming Liu <ming.liu@toradex.com>
-rw-r--r--conf/machine/apalis-imx8.conf4
-rw-r--r--conf/machine/colibri-imx8x.conf4
-rw-r--r--conf/machine/include/apalis-imx6.inc4
-rw-r--r--conf/machine/include/colibri-imx6.inc4
-rw-r--r--conf/machine/include/colibri-imx6ull.inc4
-rw-r--r--conf/machine/include/colibri-imx7-emmc.inc4
-rw-r--r--conf/machine/include/colibri-imx7.inc4
7 files changed, 14 insertions, 14 deletions
diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf
index 5c86271..fadb8d2 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 u-boot-distro-boot"
-IMAGE_BOOT_FILES += "${MACHINE_BOOT_FILES}"
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"
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 7e930a9..d47ff22 100644
--- a/conf/machine/colibri-imx8x.conf
+++ b/conf/machine/colibri-imx8x.conf
@@ -35,9 +35,9 @@ 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"
+IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
+WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex"
diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc
index 46911d0..032a158 100644
--- a/conf/machine/include/apalis-imx6.inc
+++ b/conf/machine/include/apalis-imx6.inc
@@ -7,9 +7,9 @@ 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"
+IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
+WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
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 f5b8350..a4a0f9e 100644
--- a/conf/machine/include/colibri-imx6.inc
+++ b/conf/machine/include/colibri-imx6.inc
@@ -7,9 +7,9 @@ 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"
+IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
+WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
KERNEL_IMAGETYPE_${MACHINE} = "zImage"
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
index 984b6f6..7f04592 100644
--- a/conf/machine/include/colibri-imx6ull.inc
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -9,6 +9,6 @@ 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"
+IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
+WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc
index b720cda..477a6b7 100644
--- a/conf/machine/include/colibri-imx7-emmc.inc
+++ b/conf/machine/include/colibri-imx7-emmc.inc
@@ -7,8 +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"
+IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
+WKS_FILE_DEPENDS_append = " 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 282ad6b..45bed9c 100644
--- a/conf/machine/include/colibri-imx7.inc
+++ b/conf/machine/include/colibri-imx7.inc
@@ -8,9 +8,9 @@ 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"
+IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
+WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
MACHINE_FIRMWARE_remove = "firmware-imx-epdc"