DistroKit Mailinglist
 help / color / mirror / Atom feed
From: Marco Felsch <m.felsch@pengutronix.de>
To: distrokit@pengutronix.de
Subject: [DistroKit] [PATCH 07/14] v8a: barebox-imx8m: make use of the INJECT_FILES mechanism
Date: Fri, 10 Feb 2023 20:36:05 +0100	[thread overview]
Message-ID: <20230210193612.2143905-8-m.felsch@pengutronix.de> (raw)
In-Reply-To: <20230210193612.2143905-1-m.felsch@pengutronix.de>

Use the mainline available mechanism to copy the required firmware
artifacts. This also align the code with the barebox-rockchip.make file.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 configs/platform-v8a/rules/barebox-imx8m.make | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/configs/platform-v8a/rules/barebox-imx8m.make b/configs/platform-v8a/rules/barebox-imx8m.make
index 0d88f46..4fac9d4 100644
--- a/configs/platform-v8a/rules/barebox-imx8m.make
+++ b/configs/platform-v8a/rules/barebox-imx8m.make
@@ -31,6 +31,19 @@ BAREBOX_IMX8M_BUILD_OOT	:= KEEP
 # Prepare
 # ----------------------------------------------------------------------------
 
+BAREBOX_IMX8M_INJECT_PATH	:= ${PTXDIST_SYSROOT_TARGET}/usr/lib
+
+# TF-A firmware blobs
+BAREBOX_IMX8M_INJECT_FILES	+= firmware/imx8mm-bl31.bin
+BAREBOX_IMX8M_INJECT_FILES	+= firmware/imx8mp-bl31.bin
+BAREBOX_IMX8M_INJECT_FILES	+= firmware/imx8mq-bl31.bin
+
+# DRAM firmware blobs
+BAREBOX_IMX8M_INJECT_FILES	+= firmware/ddr/synopsys/lpddr4_pmu_train_1d_dmem.bin:firmware/lpddr4_pmu_train_1d_dmem.bin
+BAREBOX_IMX8M_INJECT_FILES	+= firmware/ddr/synopsys/lpddr4_pmu_train_1d_imem.bin:firmware/lpddr4_pmu_train_1d_imem.bin
+BAREBOX_IMX8M_INJECT_FILES	+= firmware/ddr/synopsys/lpddr4_pmu_train_2d_dmem.bin:firmware/lpddr4_pmu_train_2d_dmem.bin
+BAREBOX_IMX8M_INJECT_FILES	+= firmware/ddr/synopsys/lpddr4_pmu_train_2d_imem.bin:firmware/lpddr4_pmu_train_2d_imem.bin
+
 # use host pkg-config for host tools
 BAREBOX_IMX8M_PATH := PATH=$(HOST_PATH)
 
@@ -64,16 +77,7 @@ endif
 $(STATEDIR)/barebox-imx8m.prepare: $(BAREBOX_IMX8M_CONFIG)
 	@$(call targetinfo)
 	@$(call world/prepare, BAREBOX_IMX8M)
-
-	@for i in lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_1d_imem.bin \
-			lpddr4_pmu_train_2d_dmem.bin lpddr4_pmu_train_2d_imem.bin ; do \
-		cp $(PTXCONF_SYSROOT_TARGET)/usr/lib/firmware/ddr/synopsys/$$i $(BAREBOX_IMX8M_DIR)/firmware/; \
-	done
-
-	@for i in m p q; do \
-		cp $(PTXCONF_SYSROOT_TARGET)/usr/lib/firmware/imx8m$$i-bl31.bin \
-			$(BAREBOX_IMX8M_DIR)/firmware/; \
-	done
+	@$(call world/inject, BAREBOX_IMX8M)
 
 	@rm -f "$(BAREBOX_IMX8M_BUILD_DIR)/.ptxdist-defaultenv"
 	@ln -s "$(call ptx/in-platformconfigdir, barebox-common-defaultenv)" \
-- 
2.30.2




  parent reply	other threads:[~2023-02-10 19:36 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-10 19:35 [DistroKit] [PATCH 00/14] Mainline TF-A support and blspec-entry cleanups Marco Felsch
2023-02-10 19:35 ` [DistroKit] [PATCH 01/14] v7a: tf-a: version bump v2.7 -> 2.8/customers/pengutronix/distrokit/20230210-1 Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 02/14] v8a: tf-a: enable package Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 03/14] v8a: replace imx-atf with tf-a Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 04/14] v8a: firmware-imx: fix dest path Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 05/14] v8a: firmware-imx: fix destition path Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 06/14] v8a: barebox-imx8m: fix firmware-imx dependencies Marco Felsch
2023-02-10 19:36 ` Marco Felsch [this message]
2023-02-10 19:36 ` [DistroKit] [PATCH 08/14] v8a: barebox: version sync to 2023.01.0 Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 09/14] blspec-entry: import from upstream ptxdist-2022.12.0 Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 10/14] blspec-entry: add linux-appendroot support Marco Felsch
2023-02-13  9:00   ` Michael Olbrich
2023-02-13 10:20     ` Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 11/14] v8a: blspec: switch to default blspec entry Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 12/14] v7a: blspec: drop incomplete Gute Fee support Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 13/14] v7a: vexpress: remove console from blspec config Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 14/14] v7a: blspec: convert to ptxdist default entries Marco Felsch
2023-02-11 20:59 ` [DistroKit] [PATCH 00/14] Mainline TF-A support and blspec-entry cleanups Robert Schwebel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230210193612.2143905-8-m.felsch@pengutronix.de \
    --to=m.felsch@pengutronix.de \
    --cc=distrokit@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox