[DistroKit] [PATCH 1/9] platform: v8a: firmware-imx: Fix dependencies

[Alexander Dahl <ada@thorsis.com>]

This dependency was fixed already with commit cb9e16dd1aa0 ("v8a:
barebox-imx8m: fix firmware-imx dependencies") but after commit
7a176f41a826 ("v8a: barebox: switch to upstream rule") and 8e9db9c88725
("v8a: barebox: remove left-over SoC-specific rules") the file carrying
the dependency is gone.  So now if FIRMWARE_IMX_BOOTIMAGE_IMX8 was
disabled barebox.prepare failed like this:

    -----------------------
    target: barebox.prepare
    -----------------------

    Inject file DistroKit/platform-v8a/sysroot-target/usr/lib/firmware/imx8mm-bl31.bin into DistroKit/platform-v8a/build-target/barebox-2024.03.0/firmware/imx8mm-bl31.bin...

    Inject file DistroKit/platform-v8a/sysroot-target/usr/lib/firmware/imx8mn-bl31.bin into DistroKit/platform-v8a/build-target/barebox-2024.03.0/firmware/imx8mn-bl31.bin...

    Inject file DistroKit/platform-v8a/sysroot-target/usr/lib/firmware/imx8mp-bl31.bin into DistroKit/platform-v8a/build-target/barebox-2024.03.0/firmware/imx8mp-bl31.bin...

    Inject file DistroKit/platform-v8a/sysroot-target/usr/lib/firmware/imx8mq-bl31.bin into DistroKit/platform-v8a/build-target/barebox-2024.03.0/firmware/imx8mq-bl31.bin...

    ptxdist: error: Blob 'ddr/synopsys/lpddr4_pmu_train_1d_dmem.bin' not found in '/mnt/data/adahl/src/DistroKit/platform-v8a/sysroot-target/usr/lib/firmware'.

    make: *** [/usr/local/lib/ptxdist-2024.03.0/rules/barebox.make:83: /mnt/data/adahl/src/DistroKit/platform-v8a/state/barebox.prepare] Error 1

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 configs/platform-v8a/platforms/firmware-imx.in | 1 +
 configs/platform-v8a/rules/firmware-imx.make   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/configs/platform-v8a/platforms/firmware-imx.in b/configs/platform-v8a/platforms/firmware-imx.in
index 19d89ac..fc89001 100644
--- a/configs/platform-v8a/platforms/firmware-imx.in
+++ b/configs/platform-v8a/platforms/firmware-imx.in
@@ -50,5 +50,6 @@ endif
 config BAREBOX_DEPENDENCIES
 	tristate
 	select FIRMWARE_IMX
+	select FIRMWARE_IMX_BOOTIMAGE_IMX8
 	select TF_A
 
diff --git a/configs/platform-v8a/rules/firmware-imx.make b/configs/platform-v8a/rules/firmware-imx.make
index bd49885..b640db6 100644
--- a/configs/platform-v8a/rules/firmware-imx.make
+++ b/configs/platform-v8a/rules/firmware-imx.make
@@ -33,6 +33,7 @@ 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
+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
 BAREBOX_INJECT_FILES	+= ddr/synopsys/lpddr4_pmu_train_2d_dmem.bin:firmware/lpddr4_pmu_train_2d_dmem.bin
@@ -42,6 +43,7 @@ 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
-- 
2.39.2