From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 27 May 2024 18:13:16 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sBcyK-000iYf-36 for lore@lore.pengutronix.de; Mon, 27 May 2024 18:13:16 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1sBcyK-0002KI-Db; Mon, 27 May 2024 18:13:16 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sBcyG-0002K9-KZ; Mon, 27 May 2024 18:13:12 +0200 Received: from [2a0a:edc0:2:b01:1d::c5] (helo=pty.whiteo.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sBcyG-003DJF-7P; Mon, 27 May 2024 18:13:12 +0200 Received: from rsc by pty.whiteo.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1sBcyG-00HA91-0R; Mon, 27 May 2024 18:13:12 +0200 Date: Mon, 27 May 2024 18:13:12 +0200 From: Robert Schwebel To: Alexander Dahl Message-ID: References: <20240425080303.171897-1-ada@thorsis.com> <20240425080303.171897-2-ada@thorsis.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240425080303.171897-2-ada@thorsis.com> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain Subject: Re: [DistroKit] [PATCH 1/9] platform: v8a: firmware-imx: Fix dependencies X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: distrokit@pengutronix.de Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false applied to next On Thu, Apr 25, 2024 at 10:02:54AM +0200, Alexander Dahl wrote: > 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 > --- > 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 > > > -- Pengutronix e.K. | Dipl.-Ing. Robert Schwebel | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |