From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Fri, 30 Jun 2023 10:46:46 +0200
Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33])
	by lore.white.stw.pengutronix.de with esmtps  (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.94.2)
	(envelope-from <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1qF9mB-009QZd-Ml
	for lore@lore.pengutronix.de; Fri, 30 Jun 2023 10:46:46 +0200
Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de)
	by metis.ext.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces@pengutronix.de>)
	id 1qF9m8-0006hc-O6; Fri, 30 Jun 2023 10:46:44 +0200
Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54])
 by metis.ext.pengutronix.de with esmtp (Exim 4.92)
 (envelope-from <p.zabel@pengutronix.de>)
 id 1qF9m3-0006hG-35; Fri, 30 Jun 2023 10:46:39 +0200
From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Fri, 30 Jun 2023 10:46:38 +0200
Message-Id: <20230630084638.1289086-1-p.zabel@pengutronix.de>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [ptxdist] [PATCH] barebox: inject firmware before prepare for
 i.MX8M on 2023.06.0
X-BeenThere: ptxdist@pengutronix.de
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
X-SA-Exim-Connect-IP: 127.0.0.1
X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false

Since Barebox 2023.06.0, specifically commit 624962fb45c6 ("ARM: i.MX:
make boards selectable only when firmware files are present"), some
i.MX8M boards will be dropped from the configuration, if required DDR
training and TF-A firmware files are not already present in the source
tree.
To fix this, inject them before calling prepare.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/barebox.make | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/rules/barebox.make b/rules/barebox.make
index 6383e1c72f52..c0d9c5744e4a 100644
--- a/rules/barebox.make
+++ b/rules/barebox.make
@@ -80,6 +80,9 @@ endif
 
 $(STATEDIR)/barebox.prepare:
 	@$(call targetinfo)
+ifdef PTXCONF_BAREBOX_FIRMWARE
+	@$(call world/inject, BAREBOX)
+endif
 	@$(call world/prepare, BAREBOX)
 
 ifdef PTXCONF_BAREBOX_EXTRA_ENV
@@ -95,11 +98,6 @@ ifdef PTXCONF_BAREBOX_EXTRA_ENV
 		fi;)
 	@rm -rf $(BAREBOX_BUILD_DIR)/defaultenv/barebox_default_env
 endif
-
-ifdef PTXCONF_BAREBOX_FIRMWARE
-	@$(call world/inject, BAREBOX)
-endif
-
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
-- 
2.39.2