[DistroKit] [PATCH v2 03/10] tf-a: unify handling of firmware parts for barebox

[Lars Schmidt <l.schmidt@pengutronix.de>]

Technically the firmware parts are coming out of tf-a.
This moves the handling of the extra files for barebox all to
the same place and makes maintenance easier.

Signed-off-by: Lars Schmidt <l.schmidt@pengutronix.de>
---
 configs/platform-v8a/rules/firmware-imx.make | 7 -------
 configs/platform-v8a/rules/tf-a.barebox.make | 6 +++---
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/configs/platform-v8a/rules/firmware-imx.make b/configs/platform-v8a/rules/firmware-imx.make
index 6b01af3cdd51137ac441d796242f0a6d0505986c..8a59b9f553505127f5374149ae09755de8bd7dfd 100644
--- a/configs/platform-v8a/rules/firmware-imx.make
+++ b/configs/platform-v8a/rules/firmware-imx.make
@@ -29,12 +29,6 @@ FIRMWARE_IMX_LICENSE_FILES := \
 #
 # Firmware blobs for barebox
 #
-ifdef PTXCONF_FIRMWARE_IMX
-BAREBOX_INJECT_FILES	+= imx8mm-bl31.bin:firmware/imx8mm-bl31.bin
-BAREBOX_INJECT_FILES	+= imx8mn-bl31.bin:firmware/imx8mn-bl31.bin
-BAREBOX_INJECT_FILES	+= imx8mp-bl31.bin:firmware/imx8mp-bl31.bin
-BAREBOX_INJECT_FILES	+= imx8mq-bl31.bin:firmware/imx8mq-bl31.bin
-BAREBOX_INJECT_FILES	+= imx93-bl31.bin:firmware/imx93-bl31.bin
 ifdef PTXCONF_FIRMWARE_IMX_BOOTIMAGE_IMX8
 BAREBOX_INJECT_FILES	+= ddr/synopsys/lpddr4_pmu_train_1d_dmem.bin:firmware/lpddr4_pmu_train_1d_dmem.bin
 BAREBOX_INJECT_FILES	+= ddr/synopsys/lpddr4_pmu_train_1d_imem.bin:firmware/lpddr4_pmu_train_1d_imem.bin
@@ -45,7 +39,6 @@ BAREBOX_INJECT_FILES	+= ddr/synopsys/ddr4_dmem_2d.bin:firmware/ddr4_dmem_2d.bin
 BAREBOX_INJECT_FILES	+= ddr/synopsys/ddr4_imem_1d.bin:firmware/ddr4_imem_1d.bin
 BAREBOX_INJECT_FILES	+= ddr/synopsys/ddr4_imem_2d.bin:firmware/ddr4_imem_2d.bin
 endif
-endif
 
 # ----------------------------------------------------------------------------
 # Extract
diff --git a/configs/platform-v8a/rules/tf-a.barebox.make b/configs/platform-v8a/rules/tf-a.barebox.make
index 4c61af2371462996787e6b23e68fec85e39ba460..72b009f142fdccc785b9465d76722a24de30bbba 100644
--- a/configs/platform-v8a/rules/tf-a.barebox.make
+++ b/configs/platform-v8a/rules/tf-a.barebox.make
@@ -1,5 +1,5 @@
 ifdef PTXCONF_TF_A
-ifneq ($(filter k3,$(call remove_quotes, $(PTXCONF_TF_A_PLATFORMS))),)
-BAREBOX_INJECT_FILES	+= k3-bl31.bin:firmware/k3-bl31.bin
-endif
+# currently k3, imx8(mq/mm/mn/mp), imx93
+BAREBOX_INJECT_FILES	+= $(foreach plat,$(TF_A_PLATFORMS), \
+	$(plat)-bl31.bin:firmware/$(plat)-bl31.bin)
 endif
\ No newline at end of file

-- 
2.39.5