From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 25 Apr 2024 10:03: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 1rzu4a-00GKCo-1L for lore@lore.pengutronix.de; Thu, 25 Apr 2024 10:03: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 1rzu4Z-00018d-HC; Thu, 25 Apr 2024 10:03:15 +0200 Received: from mail.thorsis.com ([217.92.40.78]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rzu4U-00017o-4i for distrokit@pengutronix.de; Thu, 25 Apr 2024 10:03:11 +0200 Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 665BC148DA03 for ; Thu, 25 Apr 2024 10:03:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thorsis.com; s=dkim; t=1714032189; h=from:subject:date:message-id:to:mime-version: content-transfer-encoding:in-reply-to:references; bh=9PsvnJvJRMnGpwkmSOFcfVlBFLnOhRF7TrZyTBBIMB0=; b=DfOJ3O4GsPU014lGozKrOFqq1/k1Xas6eBRXVibj/W0YkM4X1zBNpAgtBODujOMBf7kaF3 DiF6VB6/AtLyxjMlJ7/x2ZVOAYTW2FZNCGUudAC6YqQ5eHe5YcApdA0TODZISmyrRsYncu tt73UuvnOeq/IVM3CBOgir5wr/eCzbCcWNr32EbHrB5W9/xRMgP7LJicM1MC8DEXEzkd2X Sab0lRTRZP8kg1ivkMtsMvAWquFR7aZ2jIxB5TTv43agpwZX+ax0/WXF6p0+BnNaUjDHjN pljND39NpfZSIEZsTYd7fUrkvUyTWC2xr9pvxSCAG9JAM17ojCCTxMKlOJD5uQ== From: Alexander Dahl To: distrokit@pengutronix.de Date: Thu, 25 Apr 2024 10:02:54 +0200 Message-Id: <20240425080303.171897-2-ada@thorsis.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240425080303.171897-1-ada@thorsis.com> References: <20240425080303.171897-1-ada@thorsis.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Last-TLS-Session-Version: TLSv1.3 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.9 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [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: , 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 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