From 4393653953a2691769db6f245ee1c6b12b70bea8 Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Thu, 1 Apr 2021 05:57:32 +0000 Subject: [PATCH] conf/machine: am64xx/j7200: Drop trusted-firmware deployment for tar wic wic and tar dependency on trusted firmware is wrong. It is u-boot build that depends on trusted firmware deployment and is correctly handled by u-boot recipe. No point in duplicating that dependency, so just clean it all up. Reported-by: Denys Dmytriyenko Signed-off-by: Nishanth Menon Reviewed-by: Denys Dmytriyenko --- conf/machine/am64xx-evm.conf | 3 --- conf/machine/am64xx-sk.conf | 3 --- conf/machine/j7200-evm.conf | 3 --- 3 files changed, 9 deletions(-) diff --git a/conf/machine/am64xx-evm.conf b/conf/machine/am64xx-evm.conf index eda310a3..788b15ab 100644 --- a/conf/machine/am64xx-evm.conf +++ b/conf/machine/am64xx-evm.conf @@ -8,8 +8,5 @@ IMAGE_BOOT_FILES = "tispl.bin u-boot.img" UBOOT_MACHINE = "am64x_evm_a53_defconfig" -do_image_wic[depends] += "trusted-firmware-a:do_deploy" -do_image_tar[depends] += "trusted-firmware-a:do_deploy" - do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" diff --git a/conf/machine/am64xx-sk.conf b/conf/machine/am64xx-sk.conf index 4cad8adc..70c9c4f6 100644 --- a/conf/machine/am64xx-sk.conf +++ b/conf/machine/am64xx-sk.conf @@ -8,9 +8,6 @@ IMAGE_BOOT_FILES = "tispl.bin u-boot.img" UBOOT_MACHINE = "am64x_sk_a53_defconfig" -do_image_wic[depends] += "trusted-firmware-a:do_deploy" -do_image_tar[depends] += "trusted-firmware-a:do_deploy" - do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" diff --git a/conf/machine/j7200-evm.conf b/conf/machine/j7200-evm.conf index dab6d8cb..5a589f30 100644 --- a/conf/machine/j7200-evm.conf +++ b/conf/machine/j7200-evm.conf @@ -16,8 +16,5 @@ UBOOT_MACHINE = "j7200_evm_a72_config" IMAGE_BOOT_FILES = "tispl.bin u-boot.img" -do_image_wic[depends] += "trusted-firmware-a:do_deploy" -do_image_tar[depends] += "trusted-firmware-a:do_deploy" - do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"