mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <sha@pengutronix.de>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] ARM: stm32mp: don't generate .img symlinks for .stm32 binaries
Date: Thu, 21 Sep 2023 10:05:11 +0200	[thread overview]
Message-ID: <20230921080511.GA637806@pengutronix.de> (raw)
In-Reply-To: <20230915130353.2217982-1-a.fatoum@pengutronix.de>

On Fri, Sep 15, 2023 at 03:03:53PM +0200, Ahmad Fatoum wrote:
> The .img extension for stm32mp1 images has been unfortunate. The format was
> deprecated and finally removed in TF-A v2.8 in favor of the FIP format.
> 
> We won't remove support in barebox soon, but we shouldn't call these images
> *.img. Since commit 3536e3904152 ("ARM: stm32mp: change stm32image extension to .stm32")
> introduced with v2022.04.0, the .img files have been symlinks to regular files with
> a stm32 extension and this commit now finishes the job and deletes the .img symlinks.
> 
> Users still using older TF-A versions should change their build system to use the same
> barebox image file, but with .stm32 extension.
> 
> Users with new TF-A versions, should use the barebox-stm32mp-generic-bl33.img
> as non-trusted firmware in the FIP in addition to a matching device tree generated
> during the same barebox build.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  images/Makefile.stm32mp | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/images/Makefile.stm32mp b/images/Makefile.stm32mp
> index 59d65722078d..86ff870051c2 100644
> --- a/images/Makefile.stm32mp
> +++ b/images/Makefile.stm32mp
> @@ -9,7 +9,7 @@
>  .SECONDEXPANSION:
>  $(obj)/%.stm32: $(obj)/$$(FILE_$$(@F)) FORCE
>  	$(Q)if [ -z $(FILE_$(@F)) ]; then echo "FILE_$(@F) empty!"; false; fi
> -	@(cd $(obj) && ln -fs $(notdir $@) $(basename $(notdir $@)).img)
> +	@(cd $(obj) && rm -f $(basename $(notdir $@)).img)
>  	$(call if_changed,stm32_image)
>  
>  define build_stm32mp_image =
> -- 
> 2.39.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



      reply	other threads:[~2023-09-21  8:06 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-15 13:03 Ahmad Fatoum
2023-09-21  8:05 ` Sascha Hauer [this message]

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=20230921080511.GA637806@pengutronix.de \
    --to=sha@pengutronix.de \
    --cc=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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