summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMing Liu <ming.liu@toradex.com>2021-02-24 11:04:05 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2021-03-23 17:19:13 +0100
commit0ddebf099de7ff4b2ffdbf5fcce74dce6b1a1fe0 (patch)
tree488d54a3db89540656e8e86bf7c91e04064e66a5
parent15fda5270a4cd6ab182b8f11f67b778167ee7b10 (diff)
meta: drop redundant variables
Drop redundant IMAGE_BOOT_FILES_append/WKS_FILE_DEPENDS_append, they are already in meta-freescale-3rdparty. Related-to: ELB-3583 Signed-off-by: Ming Liu <ming.liu@toradex.com> (cherry picked from commit ddd76cf2bb716014a6a66604752803a306b1dc61)
-rw-r--r--conf/machine/include/apalis-imx6.inc3
-rw-r--r--conf/machine/include/colibri-imx6.inc3
-rw-r--r--conf/machine/include/colibri-imx6ull.inc3
-rw-r--r--conf/machine/include/colibri-imx7-emmc.inc3
-rw-r--r--conf/machine/include/colibri-imx7.inc3
5 files changed, 0 insertions, 15 deletions
diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc
index 487f807..00750c7 100644
--- a/conf/machine/include/apalis-imx6.inc
+++ b/conf/machine/include/apalis-imx6.inc
@@ -7,9 +7,6 @@ OFFSET_SPL_PAYLOAD = "138"
MACHINE_NAME = "Apalis-iMX6"
-IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
-WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
-
KERNEL_DEVICETREE += "imx6q-apalis-ixora-v1.2.dtb"
KERNEL_DEVICETREE_use-mainline-bsp += " \
imx6q-apalis-eval.dtb \
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc
index c6dbaf6..5330bc5 100644
--- a/conf/machine/include/colibri-imx6.inc
+++ b/conf/machine/include/colibri-imx6.inc
@@ -10,9 +10,6 @@ MACHINE_NAME = "Colibri-iMX6"
TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "colibri-imx6_lcd-lt161010_overlay.dtbo colibri-imx6_stmpe-ts_overlay.dtbo"
TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT_use-mainline-bsp = "colibri-imx6_parallel-rgb_overlay.dtbo colibri-imx6_stmpe-ts_overlay.dtbo display-edt7_overlay.dtbo"
-IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
-WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
-
KERNEL_DEVICETREE += " \
imx6dl-colibri-iris.dtb \
imx6dl-colibri-iris-v2.dtb \
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
index 5b0c60c..0b5e718 100644
--- a/conf/machine/include/colibri-imx6ull.inc
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -16,9 +16,6 @@ UBOOT_ENTRYPOINT_colibri-imx6ull = "0x81000000"
MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp"
-IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
-WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
-
UBOOT_ENTRYPOINT_colibri-imx6ull = "0x81000000"
UBOOT_MAKE_TARGET_colibri-imx6ull = "u-boot.imx"
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc
index 6e8853b..29776c8 100644
--- a/conf/machine/include/colibri-imx7-emmc.inc
+++ b/conf/machine/include/colibri-imx7-emmc.inc
@@ -9,9 +9,6 @@ MACHINE_NAME = "Colibri-iMX7-eMMC"
MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp"
-IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
-WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
-
MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc
index 9c9db81..2542228 100644
--- a/conf/machine/include/colibri-imx7.inc
+++ b/conf/machine/include/colibri-imx7.inc
@@ -10,9 +10,6 @@ MACHINE_NAME = "Colibri-iMX7"
MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp"
-IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
-WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
-
MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
KERNEL_DEVICETREE_append_use-nxp-bsp += " \