From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 24 Jun 2025 17:47:05 +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 1uU5rV-00Adtq-04 for lore@lore.pengutronix.de; Tue, 24 Jun 2025 17:47:05 +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 1uU5rU-0005EC-4r; Tue, 24 Jun 2025 17:47:04 +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 1uU5rN-0004uj-Kw; Tue, 24 Jun 2025 17:46:57 +0200 Received: from dude06.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::5c]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1uU5rN-0058Zq-0p; Tue, 24 Jun 2025 17:46:57 +0200 Received: from localhost ([::1] helo=dude06.red.stw.pengutronix.de) by dude06.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1uU5rN-005dSN-0U; Tue, 24 Jun 2025 17:46:57 +0200 From: Lars Schmidt Date: Tue, 24 Jun 2025 17:46:53 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250624-am62-beagleplay-v2-3-9fcf3e67a98b@pengutronix.de> References: <20250624-am62-beagleplay-v2-0-9fcf3e67a98b@pengutronix.de> In-Reply-To: <20250624-am62-beagleplay-v2-0-9fcf3e67a98b@pengutronix.de> To: distrokit@pengutronix.de X-Mailer: b4 0.14.2 Subject: [DistroKit] [PATCH v2 03/10] tf-a: unify handling of firmware parts for barebox 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: l.schmidt@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 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 --- 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