[ptxdist] [PATCH] barebox: inject firmware before prepare for i.MX8M on 2023.06.0

[ptxdist] [PATCH] barebox: inject firmware before prepare for i.MX8M on 2023.06.0

[Philipp Zabel]

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

Re: [ptxdist] [APPLIED] barebox: inject firmware before prepare for i.MX8M on 2023.06.0

[Michael Olbrich]

Thanks, applied as a680ccc5e800fd190389819645cfae44b51f7c61.

Michael

[sent from post-receive hook]

On Sat, 08 Jul 2023 09:02:49 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> 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>
> Message-Id: <20230630084638.1289086-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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)
>  
>  # ----------------------------------------------------------------------------