Thanks, applied as a680ccc5e800fd190389819645cfae44b51f7c61.
Michael
[sent from post-receive hook]
On Sat, 08 Jul 2023 09:02:49 +0200, Philipp Zabel <p.za...@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.za...@pengutronix.de>
> Message-Id: <20230630084638.1289086-1-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbr...@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)
>
> #
> ----------------------------------------------------------------------------
